From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F064158041 for ; Tue, 2 Apr 2024 17:54:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65A3FE2A1E; Tue, 2 Apr 2024 17:54:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4083FE2A1E for ; Tue, 2 Apr 2024 17:54:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F2C13431FA for ; Tue, 2 Apr 2024 17:54:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DE68B2A for ; Tue, 2 Apr 2024 17:54:27 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1712080462.0785cd27c30f5e045bda1b6dc6e517d3499a4e55.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/files/, dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/files/gentoo.config-1.0.4 dev-libs/openssl/openssl-3.2.1-r1.ebuild X-VCS-Directories: dev-libs/openssl/files/ dev-libs/openssl/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 0785cd27c30f5e045bda1b6dc6e517d3499a4e55 X-VCS-Branch: master Date: Tue, 2 Apr 2024 17:54:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f0fa11ca-db79-49d6-b1ed-58af20cdfef0 X-Archives-Hash: 61f934cded7bdc478af175af377dd4c6 commit: 0785cd27c30f5e045bda1b6dc6e517d3499a4e55 Author: Fabian Groffen gentoo org> AuthorDate: Tue Apr 2 17:52:42 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Apr 2 17:54:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0785cd27 dev-libs/openssl-3.2.1-r1: fix for Darwin don't run append-atomic-flags with non-GNU-like linker add guess for arm64-darwin Signed-off-by: Fabian Groffen gentoo.org> dev-libs/openssl/files/gentoo.config-1.0.4 | 2 ++ dev-libs/openssl/openssl-3.2.1-r1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-libs/openssl/files/gentoo.config-1.0.4 b/dev-libs/openssl/files/gentoo.config-1.0.4 index 5f205781ae3e..d32ce877a34a 100644 --- a/dev-libs/openssl/files/gentoo.config-1.0.4 +++ b/dev-libs/openssl/files/gentoo.config-1.0.4 @@ -32,6 +32,7 @@ if [[ $1 == "test" ]] ; then "i686-apple-darwinX |darwin-i386-cc" \ "i386-apple-darwinX |darwin-i386-cc" \ "powerpc-apple-darwinX |darwin-ppc-cc" \ + "arm64-apple-darwinX |darwin-arm64-cc" \ "i586-pc-winnt |winnt-parity" \ "s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \ "s390x-linux-gnu |linux64-s390x" \ @@ -155,6 +156,7 @@ darwin) powerpc) machine=ppc-cc;; i?86*) machine=i386-cc;; x86_64) machine=x86_64-cc; system=${system}64;; + arm64) machine=arm64-cc; system=${system}64;; esac ;; hpux) diff --git a/dev-libs/openssl/openssl-3.2.1-r1.ebuild b/dev-libs/openssl/openssl-3.2.1-r1.ebuild index 79bd29a1a54e..ee2e112cd6f0 100644 --- a/dev-libs/openssl/openssl-3.2.1-r1.ebuild +++ b/dev-libs/openssl/openssl-3.2.1-r1.ebuild @@ -148,8 +148,8 @@ src_configure() { append-flags $(test-flags-CC -Wa,--noexecstack) - # bug #895308 - append-atomic-flags + # bug #895308 -- check inserts GNU ld-compatible arguments + [[ ${CHOST} == *-darwin* ]] || append-atomic-flags # Configure doesn't respect LIBS export LDLIBS="${LIBS}"