svn commit: r535313 - in branches/2020Q2/security/nss: . files

[Piotr Kubaj]

Author: pkubaj
Date: Fri May 15 18:31:16 2020
New Revision: 535313
URL: https://svnweb.freebsd.org/changeset/ports/535313

Log:
  MFH: r535312
  
  security/nss: fix build on powerpc and powerpc64 with gcc
  
  PR:             246419
  Approved by:    jbeich (maintainer)
  
  Approved by:	portmgr (fix build blanket)

Added:
  branches/2020Q2/security/nss/files/powerpc-lib_freebl_scripts_gen.sh
     - copied unchanged from r535312, head/security/nss/files/powerpc-lib_freebl_scripts_gen.sh
  branches/2020Q2/security/nss/files/powerpc64elfv1-lib_freebl_scripts_gen.sh
     - copied unchanged from r535312, head/security/nss/files/powerpc64elfv1-lib_freebl_scripts_gen.sh
  branches/2020Q2/security/nss/files/powerpc64elfv2-lib_freebl_scripts_gen.sh
     - copied unchanged from r535312, head/security/nss/files/powerpc64elfv2-lib_freebl_scripts_gen.sh
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 18:30:21 2020	(r535312)
+++ branches/2020Q2/security/nss/Makefile	Fri May 15 18:31:16 2020	(r535313)
@@ -47,7 +47,12 @@ INSTALL_BINS=	certutil cmsutil crlutil derdump makepqg
 		ssltap strsclnt symkeyutil vfychain vfyserv
 
 OPTIONS_DEFINE=	DEBUG
+OPTIONS_DEFINE_powerpc64=	VSX
+OPTIONS_DEFINE_powerpc=	VSX
 
+VSX_CFLAGS=	-DUSE_PPC_CRYPTO
+VSX_DESC=	Use VSX optimized routines (POWER8 or newer)
+
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDEBUG}
@@ -57,7 +62,8 @@ BINS=		${DIST}/${OPSYS}${OSREL}_OPT.OBJ
 BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
 .endif
 
-.if ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64 || ${ARCH} == powerpc
+EXTRA_PATCHES=	${FILESDIR}/${ARCH}${PPC_ABI:tl}-lib_freebl_scripts_gen.sh
 USE_GCC=	yes
 .else
 MAKE_ENV+=	NSS_DISABLE_ALTIVEC=1
@@ -88,6 +94,11 @@ post-patch:
 	@cd ${WRKSRC} && \
 		${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
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/nss ${STAGEDIR}${PREFIX}/lib

Copied: branches/2020Q2/security/nss/files/powerpc-lib_freebl_scripts_gen.sh (from r535312, head/security/nss/files/powerpc-lib_freebl_scripts_gen.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/security/nss/files/powerpc-lib_freebl_scripts_gen.sh	Fri May 15 18:31:16 2020	(r535313, copy of r535312, head/security/nss/files/powerpc-lib_freebl_scripts_gen.sh)
@@ -0,0 +1,11 @@
+--- lib/freebl/scripts/gen.sh.orig	2020-05-12 17:17:31 UTC
++++ lib/freebl/scripts/gen.sh
+@@ -3,7 +3,7 @@
+ # Run the scripts in this folder, generating the assembly,
+ #
+ 
+-perl sha512p8-ppc.pl linux64le sha512-p8.s
++perl sha512p8-ppc.pl linux32 sha512-p8.s
+ 
+ # Add the license mention
+ cat > hdr << "EOF"

Copied: branches/2020Q2/security/nss/files/powerpc64elfv1-lib_freebl_scripts_gen.sh (from r535312, head/security/nss/files/powerpc64elfv1-lib_freebl_scripts_gen.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/security/nss/files/powerpc64elfv1-lib_freebl_scripts_gen.sh	Fri May 15 18:31:16 2020	(r535313, copy of r535312, head/security/nss/files/powerpc64elfv1-lib_freebl_scripts_gen.sh)
@@ -0,0 +1,11 @@
+--- lib/freebl/scripts/gen.sh.orig	2020-05-12 17:17:31 UTC
++++ lib/freebl/scripts/gen.sh
+@@ -3,7 +3,7 @@
+ # Run the scripts in this folder, generating the assembly,
+ #
+ 
+-perl sha512p8-ppc.pl linux64le sha512-p8.s
++perl sha512p8-ppc.pl linux64 sha512-p8.s
+ 
+ # Add the license mention
+ cat > hdr << "EOF"

Copied: branches/2020Q2/security/nss/files/powerpc64elfv2-lib_freebl_scripts_gen.sh (from r535312, head/security/nss/files/powerpc64elfv2-lib_freebl_scripts_gen.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/security/nss/files/powerpc64elfv2-lib_freebl_scripts_gen.sh	Fri May 15 18:31:16 2020	(r535313, copy of r535312, head/security/nss/files/powerpc64elfv2-lib_freebl_scripts_gen.sh)
@@ -0,0 +1,11 @@
+--- lib/freebl/scripts/gen.sh.orig	2020-05-12 17:17:31 UTC
++++ lib/freebl/scripts/gen.sh
+@@ -3,7 +3,7 @@
+ # Run the scripts in this folder, generating the assembly,
+ #
+ 
+-perl sha512p8-ppc.pl linux64le sha512-p8.s
++perl sha512p8-ppc.pl linux64v2 sha512-p8.s
+ 
+ # Add the license mention
+ cat > hdr << "EOF"