diff options
| author |   Alexey Sokolov <alexey+gentoo@asokolov.org> | 2024-03-03 20:35:02 +0000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-03-04 02:21:09 +0000 |
| commit | 743b110bffe25c0501ae5473ad8ad68253a14f29 (patch) | |
| tree | e26e1513d475929456407441076754347b3329a3 /sys-libs/zlib | |
| parent | app-text/mdbook: Stabilize 0.4.37 arm, #926115 (diff) | |
| download | gentoo-743b110bffe25c0501ae5473ad8ad68253a14f29.tar.gz gentoo-743b110bffe25c0501ae5473ad8ad68253a14f29.tar.bz2 gentoo-743b110bffe25c0501ae5473ad8ad68253a14f29.zip | |
sys-libs/zlib: respect AR on darwin
Closes: https://bugs.gentoo.org/924839
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-libs/zlib')
| -rw-r--r-- | sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch | 22 | ||||
| -rw-r--r-- | sys-libs/zlib/zlib-1.3.1-r1.ebuild | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch b/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch new file mode 100644 index 000000000000..4506e753ca2e --- /dev/null +++ b/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch @@ -0,0 +1,22 @@ +diff --color -ur zlib-1.3.1/configure zlib-1.3.1.new/configure +--- zlib-1.3.1/configure 2024-01-21 02:29:31.000000000 +0000 ++++ zlib-1.3.1.new/configure 2024-02-17 19:37:10.614600000 +0000 +@@ -265,14 +265,16 @@ + SHAREDLIBV=libz.$VER$shared_ext + SHAREDLIBM=libz.$VER1$shared_ext + LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} ++ if test -z ${AR}; then + if "${CROSS_PREFIX}libtool" -V 2>&1 | grep Apple > /dev/null; then + AR="${CROSS_PREFIX}libtool" + elif libtool -V 2>&1 | grep Apple > /dev/null; then + AR="libtool" + else + AR="/usr/bin/libtool" + fi +- ARFLAGS="-o" ;; ++ ARFLAGS="-o" ++ fi ;; + *) + LDSHARED=${LDSHARED-"$cc -shared"} ;; + esac + diff --git a/sys-libs/zlib/zlib-1.3.1-r1.ebuild b/sys-libs/zlib/zlib-1.3.1-r1.ebuild index fb44717aca45..d328fd643286 100644 --- a/sys-libs/zlib/zlib-1.3.1-r1.ebuild +++ b/sys-libs/zlib/zlib-1.3.1-r1.ebuild @@ -46,6 +46,9 @@ PATCHES=( # Fix building on sparc with older binutils, we pass it in ebuild instead "${FILESDIR}"/${PN}-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch + + # On Darwin, don't force /usr/bin/libtool as AR. bug #924839 + "${FILESDIR}"/${PN}-1.3.1-configure-fix-AR-libtool-on-darwin.patch ) src_prepare() { |