diff options
| author | maya <maya@pkgsrc.org> | 2016-10-02 22:53:23 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2016-10-02 22:53:23 +0000 |
| commit | 29b0a9378de1caaa3450cbb987fe560ede5ae146 (patch) | |
| tree | 56031846ba99774f06ee17900eac845f32744a84 /devel | |
| parent | f44018def4c85cad31c2a7b1f7950706c0f3cc41 (diff) | |
| download | pkgsrc-29b0a9378de1caaa3450cbb987fe560ede5ae146.tar.gz | |
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.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/nss/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/devel/nss/Makefile b/devel/nss/Makefile index 9740fd870d9..09242fcc378 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -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 |