CVS commit: pkgsrc/devel/nss

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jun 27 10:44:47 UTC 2023

Modified Files:
        pkgsrc/devel/nss: Makefile distinfo
Added Files:
        pkgsrc/devel/nss/patches: patch-nss_coreconf_nsinstall_Makefile

Log Message:
devel/nss: Fix cross-build under TOOLBASE/LOCALBASE split.

Omit needless TOOL_DEPENDS on nspr; patch the problem away instead.


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 pkgsrc/devel/nss/Makefile
cvs rdiff -u -r1.167 -r1.168 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/nss/patches/patch-nss_coreconf_nsinstall_Makefile

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

Modified files:

Index: pkgsrc/devel/nss/Makefile
diff -u pkgsrc/devel/nss/Makefile:1.246 pkgsrc/devel/nss/Makefile:1.247
--- pkgsrc/devel/nss/Makefile:1.246     Fri May  5 21:01:20 2023
+++ pkgsrc/devel/nss/Makefile   Tue Jun 27 10:44:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.246 2023/05/05 21:01:20 wiz Exp $
+# $NetBSD: Makefile,v 1.247 2023/06/27 10:44:46 riastradh Exp $
 #
 # release notes
 # https://firefox-source-docs.mozilla.org/security/nss/releases/index.html
@@ -33,15 +33,11 @@ BUILD_DIRS=         nss
 
 .if ${USE_CROSS_COMPILE:U:tl} == yes
 
-# nss doesn't really depend on nspr as a tool, but the
-# EXTRA_SHARED_LIBS we set there get passed through to the build of a
-# tool `nsinstall' and getting them to not be passed through is more
-# trouble than it is worth to nix this dependency.  (But if you feel
-# like going to the trouble to patch around it -- go for it!)
-TOOL_DEPENDS+=         nspr>=0:../../devel/nspr
-
 MAKE_FLAGS+=           CROSS_COMPILE=1
 MAKE_FLAGS+=           NATIVE_CC=${NATIVE_CC:Q}
+MAKE_FLAGS+=           NATIVE_CFLAGS=
+MAKE_FLAGS+=           NATIVE_LDFLAGS=
+MAKE_FLAGS+=           NATIVE_EXTRA_SHARED_LIBS=
 
 NSS_CPU_ARCH.aarch64eb=                aarch64
 NSS_CPU_ARCH.amd64=            x86_64

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.167 pkgsrc/devel/nss/distinfo:1.168
--- pkgsrc/devel/nss/distinfo:1.167     Fri May  5 21:01:20 2023
+++ pkgsrc/devel/nss/distinfo   Tue Jun 27 10:44:46 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.167 2023/05/05 21:01:20 wiz Exp $
+$NetBSD: distinfo,v 1.168 2023/06/27 10:44:46 riastradh Exp $
 
 BLAKE2s (nss-3.89.1.tar.gz) = ef2b47b75831de2f96ac8f48be41a0cbc96bafd6b1168a2d95bcb3835275c8b1
 SHA512 (nss-3.89.1.tar.gz) = aeece4e8bc28113fc53997b29c89d40b4be74fee4f5d27c4e065d2fa6701038442f4eeeb1fcf98befedb03537a5a48a4701fe270f56197da57946529f9fa02dd
@@ -17,6 +17,7 @@ SHA1 (patch-nss_cmd_signtool_util.c) = 7
 SHA1 (patch-nss_coreconf_Darwin.mk) = 5f40bb2733b88b26a40c5317d1b5edc762dfd18b
 SHA1 (patch-nss_coreconf_OpenBSD.mk) = 944f71fcaaa7d5b2b3ed008341b1392a65480f2b
 SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
+SHA1 (patch-nss_coreconf_nsinstall_Makefile) = 69981ba7355a4413111754859ef08cbd5e1bf4f4
 SHA1 (patch-nss_lib_certdb_alg1485.c) = 319ecd8bc83f4309fe24267a6b7b8d03f11d06cb
 SHA1 (patch-nss_lib_certdb_certdb.c) = 1635d99677720b7813014a70cd2a7febc2584c05
 SHA1 (patch-nss_lib_dbm_src_mktemp.c) = 999ae164ff1f2390b0e6dc2160c27906d56aa940

Added files:

Index: pkgsrc/devel/nss/patches/patch-nss_coreconf_nsinstall_Makefile
diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_coreconf_nsinstall_Makefile:1.1
--- /dev/null   Tue Jun 27 10:44:47 2023
+++ pkgsrc/devel/nss/patches/patch-nss_coreconf_nsinstall_Makefile      Tue Jun 27 10:44:47 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-nss_coreconf_nsinstall_Makefile,v 1.1 2023/06/27 10:44:47 riastradh Exp $
+
+Avoid passing target's EXTRA_SHARED_LIBS for tool build when
+cross-compiling.
+
+--- nss/coreconf/nsinstall/Makefile.orig       2023-05-05 17:06:27.000000000 +0000
++++ nss/coreconf/nsinstall/Makefile
+@@ -38,6 +38,16 @@ ifdef NATIVE_LDFLAGS
+ LDFLAGS=$(NATIVE_LDFLAGS)
+ endif
+ 
++# Note: `ifdef' is not actually `if defined', it's `if defined with a
++# non-empty definition pre-expansion', which means that even if you
++# explicitly set NATIVE_EXTRA_SHARED_LIBS= on the command-line, the
++# `ifdef NATIVE_EXTRA_SHARED_LIBS' branch is ignored.  Using this
++# bizarre `ifneq ($(origin NATIVE_EXTRA_SHARED_LIBS),undefined)'
++# contraption works around that misfeature of gmake.
++ifneq ($(origin NATIVE_EXTRA_SHARED_LIBS),undefined)
++EXTRA_SHARED_LIBS=$(NATIVE_EXTRA_SHARED_LIBS)
++endif
++
+ include $(DEPTH)/coreconf/rules.mk
+ 
+ # Redefine MAKE_OBJDIR for just this directory