From owner-svn-ports-head@freebsd.org Fri May 15 22:26:53 2020 Return-Path: Delivered-To: svn-ports-head@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 A1C002DBE1F; Fri, 15 May 2020 22:26:53 +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 49P3193lTDz4XvG; Fri, 15 May 2020 22:26:53 +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 7B3963B9E; Fri, 15 May 2020 22:26:53 +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 04FMQrrE045656; Fri, 15 May 2020 22:26:53 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04FMQreS045655; Fri, 15 May 2020 22:26:53 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202005152226.04FMQreS045655@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 22:26:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535336 - head/security/nss X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/security/nss X-SVN-Commit-Revision: 535336 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2020 22:26:53 -0000 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"||' -#.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