From owner-svn-ports-all@freebsd.org Fri May 15 18:31:17 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A974B2FD0FC; Fri, 15 May 2020 18:31:17 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49NxnK451Cz4GTj; Fri, 15 May 2020 18:31:17 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8791AB4B; Fri, 15 May 2020 18:31:17 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04FIVHMT097677; Fri, 15 May 2020 18:31:17 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04FIVGCe097673; Fri, 15 May 2020 18:31:16 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202005151831.04FIVGCe097673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 15 May 2020 18:31:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r535313 - in branches/2020Q2/security/nss: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in branches/2020Q2/security/nss: . files X-SVN-Commit-Revision: 535313 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2020 18:31:17 -0000 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 .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"||' + +#.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"