Date: Fri, 15 May 2020 22:28:03 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r535338 - branches/2020Q2/security/nss Message-ID: <202005152228.04FMS3Dr045985@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Fri May 15 22:28:02 2020 New Revision: 535338 URL: https://svnweb.freebsd.org/changeset/ports/535338 Log: MFH: r535336 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. Approved by: portmgr (fix build blanket) Modified: branches/2020Q2/security/nss/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/security/nss/Makefile ============================================================================== --- branches/2020Q2/security/nss/Makefile Fri May 15 22:27:29 2020 (r535337) +++ branches/2020Q2/security/nss/Makefile Fri May 15 22:28:02 2020 (r535338) @@ -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 USE_GCC= yes -.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005152228.04FMS3Dr045985>