mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 20:26:44 +02:00
sys-libs/zlib: Sync with Gentoo
It's from Gentoo commit 743b110bffe25c0501ae5473ad8ad68253a14f29.
This commit is contained in:
parent
76dc06aa3d
commit
85361c4e52
@ -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
|
||||
|
||||
@ -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() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user