svn commit: r535336 - head/security/nss
Piotr Kubaj
pkubaj at FreeBSD.org
Fri May 15 22:26:53 UTC 2020
Author: pkubaj
Date: Fri May 15 22:26:53 2020
New Revision: 535336
URL: https://svnweb.freebsd.org/changeset/ports/535336
Log:
security/nss: back out my own changes for troubleshooting, disable VSX when VSX option is off
I had pre-build commented out. This is needed to actually fix build.
NSS_DISABLE_ALTIVEC doesn't actually disable AltiVec.
It only disables VSX, because NSS doesn't support AltiVec.
MFH: 2020Q2 (fix build blanket)
Modified:
head/security/nss/Makefile
Modified: head/security/nss/Makefile
==============================================================================
--- head/security/nss/Makefile Fri May 15 21:05:52 2020 (r535335)
+++ head/security/nss/Makefile Fri May 15 22:26:53 2020 (r535336)
@@ -65,9 +65,10 @@ BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ
.if ${ARCH} == powerpc64 || ${ARCH} == powerpc
EXTRA_PATCHES= ${FILESDIR}/${ARCH}${PPC_ABI:tl}-lib_freebl_scripts_gen.sh
USES+= compiler:c++11-lang # -mcrypto -mvsx
-.else
+.if ! ${PORT_OPTIONS:MVSX}
MAKE_ENV+= NSS_DISABLE_ALTIVEC=1
.endif
+.endif
.if ${OPSYS} == FreeBSD && ${ARCH} == amd64
USE_BINUTILS= # intel-gcm.s
@@ -95,10 +96,10 @@ post-patch:
${FIND} . -name "*.c" -o -name "*.h" | \
${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|'
-#.if ${ARCH} == powerpc64 || ${ARCH} == powerpc
-#pre-build:
-# @cd ${WRKSRC}/lib/freebl/scripts && ./gen.sh
-#.endif
+.if ${ARCH} == powerpc64 || ${ARCH} == powerpc
+pre-build:
+ @cd ${WRKSRC}/lib/freebl/scripts && ./gen.sh
+.endif
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/include/nss ${STAGEDIR}${PREFIX}/lib
More information about the svn-ports-head
mailing list