From owner-dev-commits-ports-all@freebsd.org Sun Aug 1 10:34:13 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 8AC6765ABB4; Sun, 1 Aug 2021 10:34:13 +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 4GcyDP3V85z3N3c; Sun, 1 Aug 2021 10:34:13 +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 6089825D6; Sun, 1 Aug 2021 10:34:13 +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 171AYDoL088354; Sun, 1 Aug 2021 10:34:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 171AYDN1088353; Sun, 1 Aug 2021 10:34:13 GMT (envelope-from git) Date: Sun, 1 Aug 2021 10:34:13 GMT Message-Id: <202108011034.171AYDN1088353@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 85219598c47f - main - security/openssl-devel: unbreak on i386 via atomic stub MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85219598c47f5023fd3aa88b64e6c88493361b0e 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: Sun, 01 Aug 2021 10:34:13 -0000 The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=85219598c47f5023fd3aa88b64e6c88493361b0e commit 85219598c47f5023fd3aa88b64e6c88493361b0e Author: Bernard Spil AuthorDate: 2021-08-01 10:15:47 +0000 Commit: Bernard Spil CommitDate: 2021-08-01 10:34:03 +0000 security/openssl-devel: unbreak on i386 via atomic stub Submitted by: jbeich --- security/openssl-devel/Makefile | 2 -- .../files/patch-crypto_threads__pthread.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 9f18800fa823..5f18559936af 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -17,8 +17,6 @@ CONFLICTS_INSTALL= libressl-[0-9]* \ libressl-devel-[0-9]* \ openssl-[0-9]* -BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free - HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config CONFIGURE_ENV= PERL="${PERL}" diff --git a/security/openssl-devel/files/patch-crypto_threads__pthread.c b/security/openssl-devel/files/patch-crypto_threads__pthread.c new file mode 100644 index 000000000000..fbc67e3e8393 --- /dev/null +++ b/security/openssl-devel/files/patch-crypto_threads__pthread.c @@ -0,0 +1,20 @@ +Drop after FreeBSD 13.0/12.2 EOL around 2022-05-30 + +ld: error: undefined symbol: __atomic_is_lock_free +>>> referenced by threads_pthread.c +>>> libfips-lib-threads_pthread.o:(CRYPTO_atomic_or) in archive providers/libfips.a +>>> referenced by threads_pthread.c +>>> libfips-lib-threads_pthread.o:(CRYPTO_atomic_load) in archive providers/libfips.a + +--- crypto/threads_pthread.c.orig 2021-07-29 14:50:29 UTC ++++ crypto/threads_pthread.c +@@ -15,6 +15,9 @@ + + #if defined(__sun) + # include ++#elif defined(__clang__) && defined(__i386__) && __clang_major__ < 12 ++/* Until https://github.com/llvm/llvm-project/commit/00530dee5d12 */ ++#define __atomic_is_lock_free(size, ptr) ((void)(ptr), size <= sizeof(void *)) + #endif + + #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)