pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/59444 (textproc/ruby-nokogiri fails to install)



I think I now understand my problem: I use a bootstrapped pkgsrc. In addition to the definition of ARFLAGS provided by NetBSD and defined in /usr/share/mk/sys.mk, there is another one provided by pkgsrc with pkgtools/bootstrap-mk-files in ${LOCALBASE}/share/mk/sys.mk. The later one set ARFLAGS?= rl.

The patch below try to set ARFLAGS to 'r' on NetBSD for binutils starting from 2.39 (NetBSD 10.0_RC1 / NetBSD 10.99.3).

Do you think pkgsrc-users@ this patch can be applied?

===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/bootstrap-mk-files/Makefile,v
retrieving revision 1.61
diff -u -p -u -r1.61 Makefile
--- Makefile    19 Apr 2025 08:07:27 -0000      1.61
+++ Makefile    27 May 2025 20:19:50 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.61 2025/04/19 08:07:27 wiz Exp $

-PKGNAME=       bootstrap-mk-files-20240422
+PKGNAME=       bootstrap-mk-files-20250527
 CATEGORIES=    pkgtools

 CONFLICTS+=    mk-files-[0-9]*
@@ -21,6 +21,15 @@ USE_TOOLS+=  sed

 INSTALLATION_DIRS=     share/mk

+.include "../../mk/bsd.prefs.mk"
+
+# binutils-2.39 is provided from NetBSD 10.0_RC1 and NetBSD 10.99.3
+.if ${OPSYS} == "NetBSD" && \
+       ((${OPSYS_VERSION} >= 100000 && ${OPSYS_VERSION} < 109900) || \
+         ${OPSYS_VERSION} >= 109903)
+ARFLAGS=       r
+.endif
+
 do-extract:
        ${RUN} ${CP} -R ${FILESDIR} ${WRKSRC}

@@ -30,6 +39,10 @@ do-configure:
${CP} -f mods/${OPSYS}.$$file ${WRKSRC}/$$file; \
        done
cd ${WRKSRC}; \ + if ${TEST} -f mods/${OPSYS}.sys.mk.in; then \ + ${SED} -e 's|@ARFLAGS@|'${ARFLAGS}'|g' \ + mods/${OPSYS}.sys.mk.in > sys.mk; \ + fi; \ if ${TEST} -f mods/${OPSYS}.bsd.own.mk.in; then \ own_mk=mods/${OPSYS}.bsd.own.mk.in; \ else \
Index: files/mods/NetBSD.sys.mk
===================================================================
RCS file: files/mods/NetBSD.sys.mk
diff -N files/mods/NetBSD.sys.mk
--- files/mods/NetBSD.sys.mk    8 Sep 2016 14:28:12 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000

[...]

-ARFLAGS?=      rl
Index: files/mods/NetBSD.sys.mk.in
===================================================================
RCS file: files/mods/NetBSD.sys.mk.in
diff -N files/mods/NetBSD.sys.mk.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ files/mods/NetBSD.sys.mk.in 27 May 2025 20:19:50 -0000

[...]

+ARFLAGS?=      @ARFLAGS@


Home | Main Index | Thread Index | Old Index