pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/nss
Module Name: pkgsrc
Committed By: maya
Date: Sun Oct 2 22:53:24 UTC 2016
Modified Files:
pkgsrc/devel/nss: Makefile
Log Message:
nss: replace USE_NSS_64 with _LP64 builtin.
fixes build for 32bit when passing USE_64 (which is questionable)...
in pkgsrc we declare all mips64* platforms as 64bit, and use USE_64.
However, netbsd/mips64 is using a 32bit ABI, so it is akin to passing
USE_64=1 for 32bit.
perhaps not declaring it a 64bit platform is correct, but this package
is one of the only few using this logic, and it's unfeasible to have
correct logic for 32bit/64bit.
this package has considerably more logic for USE_64 than for USE_NSS_64,
so to avoid inadvertent damage to other platforms, retain the USE_64=1
logic.
feel free to object to this option in the discussion on tech-pkg.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 pkgsrc/devel/nss/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.118 pkgsrc/devel/nss/Makefile:1.119
--- pkgsrc/devel/nss/Makefile:1.118 Fri Sep 30 11:59:12 2016
+++ pkgsrc/devel/nss/Makefile Sun Oct 2 22:53:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2016/09/30 11:59:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.119 2016/10/02 22:53:23 maya Exp $
DISTNAME= nss-${NSS_RELEASE:S/.0$//}
NSS_RELEASE= 3.27.0
@@ -53,6 +53,14 @@ PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
MAKE_ENV+= NS_USE_GCC=YES
.endif
+SUBST_CLASSES+= 64bit
+SUBST_STAGE.64bit= post-patch
+SUBST_FILES.64bit= nss/lib/freebl/*
+SUBST_SED.64bit= -e 's,NSS_USE_64,_LP64,g'
+SUBST_MESSAGE.conf= Use a generic 64bit check
+
+# Just to be safe, do this as well as the _LP64 replacement
+# NSS has a lot more logic for USE_64
.for platform in ${LP64PLATFORMS}
. if ${MACHINE_PLATFORM:M${platform}}
MAKE_ENV+= USE_64=1
Home |
Main Index |
Thread Index |
Old Index