diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2024-04-02 19:52:42 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2024-04-02 19:54:22 +0200 |
| commit | 0785cd27c30f5e045bda1b6dc6e517d3499a4e55 (patch) | |
| tree | 88ee484fb40d506e47a557a904d7da0b176e78ae /dev-libs/openssl | |
| parent | metadata/stabilization-groups: add foot group (diff) | |
| download | gentoo-0785cd27c30f5e045bda1b6dc6e517d3499a4e55.tar.gz gentoo-0785cd27c30f5e045bda1b6dc6e517d3499a4e55.tar.bz2 gentoo-0785cd27c30f5e045bda1b6dc6e517d3499a4e55.zip | |
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 <grobian@gentoo.org>
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/files/gentoo.config-1.0.4 | 2 | ||||
| -rw-r--r-- | 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}" |