mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 09:26:58 +02:00
sys-libs/zlib: Sync with Gentoo
It's from Gentoo commit 4efe01ba2e5b6a4696ce14f70006f4ec05ac14ac.
This commit is contained in:
parent
8874b8b562
commit
5ccd77bf8a
@ -1,4 +1,6 @@
|
|||||||
DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
|
DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
|
||||||
DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B 76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67 SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
|
DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B 76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67 SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
|
||||||
DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c SHA512 5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153
|
DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c SHA512 5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153
|
||||||
|
DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8 SHA512 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
|
||||||
|
DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B 29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274 SHA512 ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621
|
||||||
DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
|
DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
|
||||||
|
@ -0,0 +1,72 @@
|
|||||||
|
https://github.com/madler/zlib/pull/599
|
||||||
|
|
||||||
|
Rebased version of:
|
||||||
|
|
||||||
|
From 37c9730ba474d274f4cc6a974943eef95087b9f6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Tue, 8 Mar 2022 22:38:47 -0800
|
||||||
|
Subject: [PATCH] configure: Pass LDFLAGS to link tests
|
||||||
|
|
||||||
|
LDFLAGS can contain critical flags without which linking wont succeed
|
||||||
|
therefore ensure that all configure tests involving link time checks are
|
||||||
|
using LDFLAGS on compiler commandline along with CFLAGS to ensure the
|
||||||
|
tests perform correctly. Without this some tests may fail resulting in
|
||||||
|
wrong confgure result, ending in miscompiling the package
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -436,7 +436,7 @@ if test $shared -eq 1; then
|
||||||
|
echo Checking for shared library support... | tee -a configure.log
|
||||||
|
# we must test in two steps (cc then ld), required at least on SunOS 4.x
|
||||||
|
if try $CC -w -c $SFLAGS $test.c &&
|
||||||
|
- try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
|
||||||
|
+ try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then
|
||||||
|
echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
|
||||||
|
elif test -z "$old_cc" -a -z "$old_cflags"; then
|
||||||
|
echo No shared library support. | tee -a configure.log
|
||||||
|
@@ -498,7 +498,7 @@ int main(void) {
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
- if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
sizet=`./$test`
|
||||||
|
echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log
|
||||||
|
CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
|
||||||
|
@@ -532,7 +532,7 @@ int main(void) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
- if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
echo "Checking for fseeko... Yes." | tee -a configure.log
|
||||||
|
else
|
||||||
|
CFLAGS="${CFLAGS} -DNO_FSEEKO"
|
||||||
|
@@ -549,7 +549,7 @@ cat > $test.c <<EOF
|
||||||
|
#include <errno.h>
|
||||||
|
int main() { return strlen(strerror(errno)); }
|
||||||
|
EOF
|
||||||
|
-if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
echo "Checking for strerror... Yes." | tee -a configure.log
|
||||||
|
else
|
||||||
|
CFLAGS="${CFLAGS} -DNO_STRERROR"
|
||||||
|
@@ -656,7 +656,7 @@ int main()
|
||||||
|
return (mytest("Hello%d\n", 1));
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
- if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log
|
||||||
|
|
||||||
|
echo >> configure.log
|
||||||
|
@@ -746,7 +746,7 @@ int main()
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
- if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log
|
||||||
|
|
||||||
|
echo >> configure.log
|
191
sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13.ebuild
vendored
Normal file
191
sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13.ebuild
vendored
Normal file
@ -0,0 +1,191 @@
|
|||||||
|
# Copyright 1999-2022 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=8
|
||||||
|
|
||||||
|
# Worth keeping an eye on 'develop' branch upstream for possible backports.
|
||||||
|
AUTOTOOLS_AUTO_DEPEND="no"
|
||||||
|
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
|
||||||
|
inherit autotools multilib-minimal usr-ldscript verify-sig
|
||||||
|
|
||||||
|
CYGWINPATCHES=(
|
||||||
|
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
|
||||||
|
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch"
|
||||||
|
)
|
||||||
|
|
||||||
|
DESCRIPTION="Standard (de)compression library"
|
||||||
|
HOMEPAGE="https://zlib.net/"
|
||||||
|
SRC_URI="https://zlib.net/${P}.tar.xz
|
||||||
|
https://zlib.net/fossils/${P}.tar.xz
|
||||||
|
https://zlib.net/current/beta/${P}.tar.xz
|
||||||
|
verify-sig? ( https://zlib.net/${P}.tar.xz.asc )
|
||||||
|
elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
|
||||||
|
|
||||||
|
LICENSE="ZLIB"
|
||||||
|
SLOT="0/1" # subslot = SONAME
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||||
|
IUSE="minizip static-libs"
|
||||||
|
|
||||||
|
RDEPEND="!sys-libs/zlib-ng[compat]"
|
||||||
|
DEPEND="${RDEPEND}"
|
||||||
|
BDEPEND="
|
||||||
|
minizip? ( ${AUTOTOOLS_DEPEND} )
|
||||||
|
verify-sig? ( sec-keys/openpgp-keys-madler )
|
||||||
|
"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
# Don't install unexpected & unused crypt.h header (which would clash with other pkgs)
|
||||||
|
# Pending upstream. bug #658536
|
||||||
|
"${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
|
||||||
|
|
||||||
|
# Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
|
||||||
|
"${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
|
||||||
|
|
||||||
|
# Respect LDFLAGS during configure tests. Pending upstream
|
||||||
|
"${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
|
||||||
|
if use elibc_Cygwin ; then
|
||||||
|
local p
|
||||||
|
for p in "${CYGWINPATCHES[@]}" ; do
|
||||||
|
# Strip out the "... -> " from the array
|
||||||
|
eapply -p2 "${DISTDIR}/${p#*> }"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
if use minizip ; then
|
||||||
|
cd contrib/minizip || die
|
||||||
|
eautoreconf
|
||||||
|
fi
|
||||||
|
|
||||||
|
case ${CHOST} in
|
||||||
|
*-cygwin*)
|
||||||
|
# Do not use _wopen, it's a mingw-only symbol
|
||||||
|
sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
|
||||||
|
|
||||||
|
# zlib1.dll is the mingw name, need cygz.dll
|
||||||
|
# cygz.dll is loaded by toolchain, put into subdir
|
||||||
|
sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
|
||||||
|
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case ${CHOST} in
|
||||||
|
*-mingw*|mingw*|*-cygwin*)
|
||||||
|
# Uses preconfigured Makefile rather than configure script
|
||||||
|
multilib_copy_sources
|
||||||
|
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
echoit() { echo "$@"; "$@"; }
|
||||||
|
|
||||||
|
multilib_src_configure() {
|
||||||
|
case ${CHOST} in
|
||||||
|
*-mingw*|mingw*|*-cygwin*)
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
# bug #347167
|
||||||
|
local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3)
|
||||||
|
|
||||||
|
local myconf=(
|
||||||
|
--shared
|
||||||
|
--prefix="${EPREFIX}/usr"
|
||||||
|
--libdir="${EPREFIX}/usr/$(get_libdir)"
|
||||||
|
${uname:+--uname=${uname}}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Not an autoconf script, so can't use econf
|
||||||
|
echoit "${S}"/configure "${myconf[@]}" || die
|
||||||
|
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if use minizip ; then
|
||||||
|
local minizipdir="contrib/minizip"
|
||||||
|
mkdir -p "${BUILD_DIR}/${minizipdir}" || die
|
||||||
|
|
||||||
|
cd ${minizipdir} || die
|
||||||
|
ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static)
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_compile() {
|
||||||
|
case ${CHOST} in
|
||||||
|
*-mingw*|mingw*|*-cygwin*)
|
||||||
|
emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
|
||||||
|
sed \
|
||||||
|
-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
|
||||||
|
-e 's|@exec_prefix@|${prefix}|g' \
|
||||||
|
-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
|
||||||
|
-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
|
||||||
|
-e 's|@includedir@|${prefix}/include|g' \
|
||||||
|
-e 's|@VERSION@|'${PV}'|g' \
|
||||||
|
zlib.pc.in > zlib.pc || die
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
emake
|
||||||
|
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
use minizip && emake -C contrib/minizip
|
||||||
|
}
|
||||||
|
|
||||||
|
sed_macros() {
|
||||||
|
# Clean up namespace a little, bug #383179
|
||||||
|
# We do it here so we only have to tweak 2 files
|
||||||
|
sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install() {
|
||||||
|
case ${CHOST} in
|
||||||
|
*-mingw*|mingw*|*-cygwin*)
|
||||||
|
emake -f win32/Makefile.gcc install \
|
||||||
|
BINARY_PATH="${ED}/usr/bin" \
|
||||||
|
LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
|
||||||
|
INCLUDE_PATH="${ED}/usr/include" \
|
||||||
|
SHARED_MODE=1
|
||||||
|
|
||||||
|
# Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136
|
||||||
|
insinto /usr/$(get_libdir)/pkgconfig
|
||||||
|
doins zlib.pc
|
||||||
|
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
emake install DESTDIR="${D}" LDCONFIG=:
|
||||||
|
gen_usr_ldscript -a z
|
||||||
|
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
sed_macros "${ED}"/usr/include/*.h
|
||||||
|
|
||||||
|
if use minizip ; then
|
||||||
|
emake -C contrib/minizip install DESTDIR="${D}"
|
||||||
|
sed_macros "${ED}"/usr/include/minizip/*.h
|
||||||
|
fi
|
||||||
|
|
||||||
|
if use minizip; then
|
||||||
|
# This might not exist if slibtool is used.
|
||||||
|
# bug #816756
|
||||||
|
rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! use static-libs ; then
|
||||||
|
# bug #419645
|
||||||
|
rm "${ED}"/usr/$(get_libdir)/libz.a || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install_all() {
|
||||||
|
dodoc FAQ README ChangeLog doc/*.txt
|
||||||
|
use minizip && dodoc contrib/minizip/*.txt
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user