svn commit: r552239 - in head/security/nss: . files

[Piotr Kubaj]

Author: pkubaj
Date: Tue Oct 13 12:40:42 2020
New Revision: 552239
URL: https://svnweb.freebsd.org/changeset/ports/552239

Log:
  security/nss: fix build on powerpc64le
  
  Change if condition to also catch anything after 64 (e.g. "le", as in powerpc64le). Currently ARCH needs to end with 64.
  
  While here, disable VSX option for powerpc64le. All powerpc64le systems are VSX-compatible anyway.

Modified:
  head/security/nss/Makefile
  head/security/nss/files/patch-coreconf_FreeBSD.mk

Modified: head/security/nss/Makefile
==============================================================================
--- head/security/nss/Makefile	Tue Oct 13 12:39:08 2020	(r552238)
+++ head/security/nss/Makefile	Tue Oct 13 12:40:42 2020	(r552239)
@@ -47,7 +47,6 @@ INSTALL_BINS=	certutil cmsutil crlutil derdump makepqg
 OPTIONS_DEFINE=	DEBUG
 OPTIONS_DEFINE_powerpc=		VSX
 OPTIONS_DEFINE_powerpc64=	VSX
-OPTIONS_DEFINE_powerpc64le=	VSX
 
 VSX_CFLAGS=	-DUSE_PPC_CRYPTO
 VSX_DESC=	Use VSX optimized routines (POWER8 or newer)
@@ -61,7 +60,7 @@ BINS=		${DIST}/${OPSYS}${OSREL}_OPT.OBJ
 BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
 .endif
 
-.if ${ARCH:Mpowerpc64*} || ${ARCH} == powerpc
+.if ${ARCH} == powerpc64 || ${ARCH} == powerpc
 EXTRA_PATCHES=	${FILESDIR}/${ARCH}${PPC_ABI:tl}-lib_freebl_scripts_gen.sh
 USES+=		compiler:c++11-lang # -mcrypto -mvsx
 .if ! ${PORT_OPTIONS:MVSX}

Modified: head/security/nss/files/patch-coreconf_FreeBSD.mk
==============================================================================
--- head/security/nss/files/patch-coreconf_FreeBSD.mk	Tue Oct 13 12:39:08 2020	(r552238)
+++ head/security/nss/files/patch-coreconf_FreeBSD.mk	Tue Oct 13 12:40:42 2020	(r552239)
@@ -24,7 +24,7 @@
 +CPU_ARCH		= ppc
 +endif
  
-+ifneq (,$(filter %64, $(OS_TEST)))
++ifneq (,$(findstring 64,$(OS_TEST)))
 +USE_64			= 1
 +endif
 +