From owner-dev-commits-ports-all@freebsd.org Tue May 18 00:54:51 2021 Return-Path: Delivered-To: dev-commits-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 CA47A637FDA; Tue, 18 May 2021 00:54:51 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FkcwW5Cbrz3Hnt; Tue, 18 May 2021 00:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 954071636A; Tue, 18 May 2021 00:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14I0spiQ046929; Tue, 18 May 2021 00:54:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14I0sp0c046928; Tue, 18 May 2021 00:54:51 GMT (envelope-from git) Date: Tue, 18 May 2021 00:54:51 GMT Message-Id: <202105180054.14I0sp0c046928@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 05b3a5e55009 - 2021Q2 - security/nss: fix build on powerpc64le MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 05b3a5e55009aea31c3d2e690e86e84b3dde8408 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 00:54:51 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=05b3a5e55009aea31c3d2e690e86e84b3dde8408 commit 05b3a5e55009aea31c3d2e690e86e84b3dde8408 Author: Piotr Kubaj AuthorDate: 2021-04-17 11:46:51 +0000 Commit: Jan Beich CommitDate: 2021-05-18 00:52:36 +0000 security/nss: fix build on powerpc64le Error: C_Initialize failed: 0x00000030, CKR_DEVICE_ERROR NSPR error code: -5977: Failure to load dynamic library Initiailzing softoken failed: 0x00000030, CKR_DEVICE_ERROR NSPR error code: -5977: Failure to load dynamic library While here also correct option description after introducing proper VSX option in https://hg.mozilla.org/projects/nss/rev/a66c71152314e591106680e6de618c3c8d044373 (cherry picked from commit 2eaa6b5910ff4c72b61a4fcf4b06c8f6c1d8db93) --- security/nss/Makefile | 2 +- security/nss/files/patch-lib-freebl-Makefile | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/security/nss/Makefile b/security/nss/Makefile index a45b69fc728a..a4f17aa15548 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -67,7 +67,7 @@ MAKE_ENV+= NSS_DISABLE_ARM32_NEON=1 EXTRA_PATCHES= ${FILESDIR}/${ARCH}${PPC_ABI:tl}-lib_freebl_scripts_gen.sh USES+= compiler:c++11-lang # -mcrypto -mvsx .if ! ${PORT_OPTIONS:MVSX} -MAKE_ENV+= NSS_DISABLE_ALTIVEC=1 +MAKE_ENV+= NSS_DISABLE_CRYPTO_VSX=1 .endif .endif diff --git a/security/nss/files/patch-lib-freebl-Makefile b/security/nss/files/patch-lib-freebl-Makefile index b42174292849..f9e412e534f5 100644 --- a/security/nss/files/patch-lib-freebl-Makefile +++ b/security/nss/files/patch-lib-freebl-Makefile @@ -1,11 +1,24 @@ ---- lib/freebl/Makefile.orig 2018-08-31 12:55:53 UTC +--- lib/freebl/Makefile.orig 2021-04-15 16:17:44 UTC +++ lib/freebl/Makefile -@@ -215,7 +215,7 @@ ifeq ($(CPU_ARCH),x86) +@@ -263,7 +263,7 @@ else ifeq ($(CPU_ARCH),x86) endif endif # Darwin -ifeq ($(OS_TARGET),Linux) +ifeq (,$(filter-out Linux FreeBSD, $(OS_TARGET))) ifeq ($(CPU_ARCH),x86_64) - ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s - ASFLAGS += -fPIC -Wa,--noexecstack + # Lower case s on mpi_amd64_common due to make implicit rules. + ASFILES = arcfour-amd64-gas.s mpi_amd64_common.s +@@ -298,10 +298,10 @@ ifdef USE_64 + PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}') + ifeq ($(PPC_ABI),2) + ASFILES += sha512-p8.s +- ifeq ($(OS_TEST),ppc64le) ++ ifeq ($(OS_TEST),powerpc64le) + EXTRA_SRCS += chacha20poly1305-ppc.c + ASFILES += chacha20-ppc64le.s +- endif # ppc64le ++ endif # powerpc64le + endif + endif # USE_64 + endif # ppc