From owner-svn-ports-head@freebsd.org Tue Oct 13 12:40:43 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 2CF2744199F; Tue, 13 Oct 2020 12:40:43 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4C9Zs70R4kz3Sjn; Tue, 13 Oct 2020 12:40:43 +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 E64691D5E1; Tue, 13 Oct 2020 12:40:42 +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 09DCegmn037498; Tue, 13 Oct 2020 12:40:42 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09DCegnP037497; Tue, 13 Oct 2020 12:40:42 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202010131240.09DCegnP037497@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 13 Oct 2020 12:40:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552239 - in head/security/nss: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/security/nss: . files X-SVN-Commit-Revision: 552239 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: Tue, 13 Oct 2020 12:40:43 -0000 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 +