gentoo auto-resync : 04:03:2024 - 05:43:09

3 files changed, 27 insertions, 1 deletions

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index aec6460896fa..528543cf0d87 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -5,6 +5,7 @@ AUX zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch 1944
 AUX zlib-1.2.13-use-LDFLAGS-in-configure.patch 2650 BLAKE2B 3cfae2b0658534aab64f7969d86307bf96724f4ec847e378c2f87b6b9e43c00bae96845d1c3405d5d913d2005e9f18f53923329ad1cfd73e9395f94d035e275f SHA512 77499165a934d171c7d4bbd177f3cfa2e57db8923c61222a48734f8d3879245ed91fe2b900b3a429db89e098a4d4fcd9f3b6f2c1c3a86f761e1b33b56a73987d
 AUX zlib-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch 685 BLAKE2B ce9e9898050d123026fdb7739bc8e31af0eb40ab45d6ca91d25330011e014f68612ab1e680adbd14ecf0286a41f1674814c9ffff9b112bcbd859ddfb147a8e98 SHA512 de0528191bcd18ec42901291bdfb931f269c5294e6223062aeddd47466a67bd8176a84dd30f1570fe8a65b90ba5b5fce3050813789edaa66aeaad6e823a182d2
 AUX zlib-1.3.1-configure-fix-AR-RANLIB-NM-detection.patch 2940 BLAKE2B ad0cd287eeb1a78a220063966138dc618ce010c30587c84c5f18f1690814c30ecebc7e28c310d9570015b8da8b5997f99dccdf4aa8665243ab172e2c1ba74c93 SHA512 28ca95ad2e95ab0cef6a0c728ff0fd94ab9bdce445de1dd40531ceb613b11bdfb7b519a8301d6ed529b76df04d561a022595de1e880bd8e00538c71384148f91
+AUX zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch 849 BLAKE2B 6bd8c5486e925ad263f35b25f774969a5ed8eb462cc6839129ec994668a022d7a1b7dd0f101fad3dbb303bfd8c637751e24f9f7dc7245899b12ede7ba8d7c184 SHA512 ae325263261618a8b9280e3b56113f079c0cc2713c3f93d715d4771a71631de6cbff9de82b39c256e15fd243ab93f35ea6428d4c5a2474675cfc09ac41d49397
 AUX zlib-1.3.1-use-LDFLAGS-in-configure.patch 2698 BLAKE2B cbb28d07c44edbf1403792f147aa20c87d3954c1724c6c87f3c099a2fb1855163a1aeea0d9e67b5e8b868d404080b6ff434ab8c5ef3cfa966281579556d186ea SHA512 5ed35372202f59032ed2929ae253b81c9e4362816e7adabae68312c20c9675f9fa9749b5f8a247c77d2f415d1592bcc229d7ddca431b1931c78e3368a5d6848e
 DIST zlib-1.3.1.tar.xz 1305740 BLAKE2B 42d109223801a493de6d52e7343403d7fc3234a6ca816425fe41ac9c18019b01b93841acd28a235e99f2256a6a17f93624e96b2ddb58d588c8190a6bedb82910 SHA512 1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d
 DIST zlib-1.3.1.tar.xz.asc 235 BLAKE2B b135336ef55a0c4b8e219e760bbe04bad082c405246ce51a2b373c3dfba0b05cb1e6f539363972f4cabd8290be1db1fdb2fc47fb562c6c612a08d9393065f75b SHA512 d181e9772a8139b3b2f3f42b994a65a966101db35eb46b5c84021c5eb0cc3b4511eb5e9172c509483bd9f7015794b15cfca78ed0959bd91e8216dc12c1c6e668
@@ -12,5 +13,5 @@ DIST zlib-1.3.tar.xz 1295740 BLAKE2B 5fe0f32339267348a313f23a21e9588bdb180b7415b
 DIST zlib-1.3.tar.xz.asc 235 BLAKE2B 5fe6ce952699a19e848d0a6e6c3622f934340068fdcd29afb35c74f3c8ae66d04de644800d10b38c743bb2f4852ba28f1a97313cb0e6e6f9b804cbca5289ebbb SHA512 8f3ce5c21938d6abc7e121d2939648a0ce2dc01a8ab4eb001d44eb159935dd0b4f5b5e371b3ecfc0ceb23689e2cefe002065968908503cde15b1bba08aff9db6
 EBUILD zlib-1.3-r2.ebuild 4621 BLAKE2B 58c6f3a494919167a0314e47c3af83ba2aad965c4180e6943455a87500e88a5d51473903e0d0addf3b0282ac189115f38dee8816ca1984ab81e1938e418f708a SHA512 3a50e51a9b293fe802f4bb359631ba28d5262ce8a7dc0e6ca79abf8360fce6ab9cdaeea901c40d93113da3c99d0db912c356ab741314a34d6bf2d6475e23b926
 EBUILD zlib-1.3-r4.ebuild 4366 BLAKE2B ea166f02044636477c2cc050363bf12d782abbe01284240ffa9d4dcca2d8561edf85ae4b29da91613d3ae83f00d30941ceef77af4c9836ea4b4c6ccfc847c705 SHA512 21ef937eb9634546a1b2003e2b0344daeb54e5e6a3b8c48a8c19f07a56396a92f370e79cb60fca843e6288366912f206cc1429bca22261edbb38ea2301610c3e
-EBUILD zlib-1.3.1-r1.ebuild 4289 BLAKE2B 6f136a0b8239eaa7e02a7349d3e103cad06d45019ed38a73c578165c48c4f55fd0fea4a485ba5720ac676ecded74d5dc42284b778befd6c5515189fc3c99710c SHA512 90980a978da7066870ccd8fe8e8a0e9765c6dd790f2a1b0ec3a78e497ee5121ed0378290509be7e8eecce974cd43edd0eb3da4fc3f68f40d97858080851a6dcf
+EBUILD zlib-1.3.1-r1.ebuild 4420 BLAKE2B 9557508fb20ae07720b180139af8f7044634284817330b21d1390174113f81ba78852c6e068589a4758689f8753b4d692f6772c990622232a60c9f13c1906d19 SHA512 24e7098fcb962cb598e7b52b3d9fc6b0c551d2eaef0c306d6e974061028387004dae81354f50840801bc36a5f50f998506a2619095c2a879d032ed949d32d9b3
 MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9
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() {