From 85361c4e5247312c017977fee36d7aab450b80ee Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 4 Mar 2024 08:02:11 +0000
Subject: [PATCH] sys-libs/zlib: Sync with Gentoo

It's from Gentoo commit 743b110bffe25c0501ae5473ad8ad68253a14f29.
---
 ...1-configure-fix-AR-libtool-on-darwin.patch | 22 +++++++++++++++++++
 .../sys-libs/zlib/zlib-1.3.1-r1.ebuild        |  3 +++
 2 files changed, 25 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch

diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-libtool-on-darwin.patch
new file mode 100644
index 0000000000..4506e753ca
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3.1-r1.ebuild
index fb44717aca..d328fd6432 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/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() {