CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov  7 13:19:47 UTC 2023

Modified Files:
        pkgsrc/devel/gettext: Makefile.common
        pkgsrc/devel/libidn2: Makefile
        pkgsrc/lang/gawk: Makefile
        pkgsrc/mk/configure: gnu-configure.mk

Log Message:
Centralize per-package hacks for lack of -rpath on Darwin/powerpc.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/gettext/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/libidn2/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/lang/gawk/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/configure/gnu-configure.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gettext/Makefile.common
diff -u pkgsrc/devel/gettext/Makefile.common:1.24 pkgsrc/devel/gettext/Makefile.common:1.25
--- pkgsrc/devel/gettext/Makefile.common:1.24   Tue Nov  7 10:51:10 2023
+++ pkgsrc/devel/gettext/Makefile.common        Tue Nov  7 13:19:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2023/11/07 10:51:10 wiz Exp $
+# $NetBSD: Makefile.common,v 1.25 2023/11/07 13:19:47 nia Exp $
 #
 # used by devel/gettext/Makefile
 # used by devel/gettext-asprintf/Makefile
@@ -20,10 +20,6 @@ USE_LIBTOOL=         yes
 GNU_CONFIGURE=         yes
 GNU_CONFIGURE_STRICT=  no # several sub-configures
 
-# Darwin does not support RPATH. It seems to attempt to force one anyway
-# with earlier versions such as 10.4, resulting in a build error.
-CONFIGURE_ARGS.Darwin+=        --disable-rpath
-
 .include "../../mk/bsd.fast.prefs.mk"
 
 # There is a bug in the 10.4 SDK that causes struct __darwin_ucontext

Index: pkgsrc/devel/libidn2/Makefile
diff -u pkgsrc/devel/libidn2/Makefile:1.16 pkgsrc/devel/libidn2/Makefile:1.17
--- pkgsrc/devel/libidn2/Makefile:1.16  Mon Nov  6 11:38:57 2023
+++ pkgsrc/devel/libidn2/Makefile       Tue Nov  7 13:19:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/11/06 11:38:57 nia Exp $
+# $NetBSD: Makefile,v 1.17 2023/11/07 13:19:47 nia Exp $
 
 DISTNAME=      libidn2-2.3.4
 CATEGORIES=    devel
@@ -16,8 +16,6 @@ PKGCONFIG_OVERRIDE+=  libidn2.pc.in
 INFO_FILES=            yes
 TEST_TARGET=           check
 
-CONFIGURE_ARGS.Darwin+=        --disable-rpath
-
 # XXX: Kludge to avoid uncoditionally pick up some gtkdoc-* tools if gtk-doc
 # XXX: package is installed and then fails in the installation phase.
 CONFIGURE_ENV+=        ac_cv_prog_GTKDOC_CHECK=

Index: pkgsrc/lang/gawk/Makefile
diff -u pkgsrc/lang/gawk/Makefile:1.78 pkgsrc/lang/gawk/Makefile:1.79
--- pkgsrc/lang/gawk/Makefile:1.78      Tue Nov  7 09:17:20 2023
+++ pkgsrc/lang/gawk/Makefile   Tue Nov  7 13:19:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2023/11/07 09:17:20 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2023/11/07 13:19:47 nia Exp $
 
 DISTNAME=      gawk-5.3.0
 CATEGORIES=    lang
@@ -35,11 +35,6 @@ CHECK_PORTABILITY_SKIP+=     doc/it/gawktexi
 CFLAGS+=       -Dvm_region=vm_region_64
 .endif
 
-.if ${MACHINE_PLATFORM:MDarwin-[0-8].*-powerpc}
-# ld does not have -rpath
-CONFIGURE_ARGS+=       --disable-rpath
-.endif
-
 PLIST_VARS+=           extension
 .if "${OPSYS}" != "MirBSD"
 PLIST.extension=       yes

Index: pkgsrc/mk/configure/gnu-configure.mk
diff -u pkgsrc/mk/configure/gnu-configure.mk:1.29 pkgsrc/mk/configure/gnu-configure.mk:1.30
--- pkgsrc/mk/configure/gnu-configure.mk:1.29   Mon Apr  4 11:23:06 2022
+++ pkgsrc/mk/configure/gnu-configure.mk        Tue Nov  7 13:19:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: gnu-configure.mk,v 1.29 2022/04/04 11:23:06 riastradh Exp $
+# $NetBSD: gnu-configure.mk,v 1.30 2023/11/07 13:19:47 nia Exp $
 #
 # Package-settable variables:
 #
@@ -59,6 +59,11 @@ CONFIGURE_ENV+=      lt_cv_sys_max_cmd_len=${
 CONFIGURE_ENV+=        lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$$'
 .endif
 
+.if ${MACHINE_PLATFORM:MDarwin-[0-8].*-powerpc}
+# ld does not have -rpath
+CONFIGURE_ARGS+=       --disable-rpath
+.endif
+
 GNU_CONFIGURE_PREFIX?= ${PREFIX}
 CONFIGURE_ARGS+=       --prefix=${GNU_CONFIGURE_PREFIX:Q}