diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-11-23 07:07:57 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-23 07:07:57 +0000 |
commit | bed152ba1fc2f1316eaefb5c3d24d48195560f76 (patch) | |
tree | 0564fbaf0c7ff23390031d68b741e89a40071333 /sys-libs/zlib | |
parent | 57c2e006d0af9ab77ced676461d7100cade4a716 (diff) |
gentoo auto-resync : 23:11:2022 - 07:07:57
Diffstat (limited to 'sys-libs/zlib')
-rw-r--r-- | sys-libs/zlib/Manifest | 3 | ||||
-rw-r--r-- | sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch | 56 | ||||
-rw-r--r-- | sys-libs/zlib/zlib-1.2.13-r1.ebuild | 9 |
3 files changed, 66 insertions, 2 deletions
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest index 0eaa6fe4661b..27973957db0e 100644 --- a/sys-libs/zlib/Manifest +++ b/sys-libs/zlib/Manifest @@ -4,6 +4,7 @@ AUX zlib-1.2.12-CRC-buggy-input.patch 1673 BLAKE2B a45b5c36dc4519f785b29981eaa47 AUX zlib-1.2.12-CVE-2022-37434.patch 2563 BLAKE2B c2aa6275365965ef5c84668372dde46a2b7579d4f87703ca91332f8473ffa8784772ff3d2105696b5c1b65ca07819a66d4e9c1ef0d6894a44fc78702901647e7 SHA512 6ae143b5de553992c1a5460faae2b309f7e9f049c3afdc5ab7f6cad4479e202affa79b09a058f23dd0f24b07c1a52719b2aa921b4209b2ddbe16caafd6df1cbb AUX zlib-1.2.12-fix-CC-logic-in-configure.patch 1427 BLAKE2B 7e76e07dc8aef1ee0f38a237a4a37f8c8fa22e1dffe70407781320a325634bc92a0485de7e0de492354672e008f3a689c16087b87c15b1c893f120f5916f906f SHA512 8cdc6fa6754d5d752ae6e59b491cf6f652feb2ea4839d8debf778bbffb0c5dcd1f952a1e7cdb2e01d6e96fe67197db1ad7908c4d9d4f654932cf3deb97cddb16 AUX zlib-1.2.12-use-LDFLAGS-in-configure.patch 2593 BLAKE2B da920b443437d2f912a3c49c2db7478b19268418f94dd70c083ff44640c71b752f84763392300fc3e843a4025910375c058a0648bef65c5ca0db419297d32be8 SHA512 d884348c96da593e3abc7f14f3eea19369c9105c9814e38012e68c53c01a51e260439d18bc7a2bb121965ad1636c774f6cb701c062eba5e79eca4f199005b859 +AUX zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch 1870 BLAKE2B f0dd2ae5ebcbf0c7fe44d4362690bcb852fa61fc081645050cddb9af187c28e3f3cec6d3173d8d2be9912bc5fc0d0933e9840c0e6b11ccba663d69f81ef41bd3 SHA512 3b4d695d307c407d58921c6426971e13f0aba33447a3ceb23724d7c3e75a1a85f5d962fa8321e6ca4ff6217819e36cf7b96d8c1df214fc2c79ba2e2f99607712 AUX zlib-1.2.13-use-LDFLAGS-in-configure.patch 2650 BLAKE2B 3cfae2b0658534aab64f7969d86307bf96724f4ec847e378c2f87b6b9e43c00bae96845d1c3405d5d913d2005e9f18f53923329ad1cfd73e9395f94d035e275f SHA512 77499165a934d171c7d4bbd177f3cfa2e57db8923c61222a48734f8d3879245ed91fe2b900b3a429db89e098a4d4fcd9f3b6f2c1c3a86f761e1b33b56a73987d 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 @@ -12,5 +13,5 @@ DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B cefcd25989ce27e7d339af2a88455fcf64f6f5e6 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 EBUILD zlib-1.2.12-r3.ebuild 5208 BLAKE2B f13244f97c80dd030bae8af8d6db4e7063b52f99b8992a156a62105f92fe94defe023706b0551a098c177dfbafcc006e07f7d0bdd4cb4e36f03bdb1cc1a723d2 SHA512 9216e57c869b69128184dc76d0b697b0c1090735aa3be5620e42cfa99d45661093be97b7bed93acfc13f3366ab520fceb41d16877decbae7805f67ca50849365 -EBUILD zlib-1.2.13-r1.ebuild 4961 BLAKE2B 0f665f7a763e072f55b76ce385384b607eae34aa05c3960fc4f731c5599dfaea5e557f61189a6de854f929e14c56825699e9000ff3db9d130a954549e6503ec8 SHA512 08a36a050ac07fb25f8f861fd5130e114561e83f9dbd31a955d4542c679a02a2b9b944252b01590341c112b40e9f5a41b3b9771fdb62d7d22e5e53e7f11e1458 +EBUILD zlib-1.2.13-r1.ebuild 5336 BLAKE2B 535640d56bb322f8a8b8b35124041cbf37d2740c32c1de332f5fb286184a90798501f369404d24876edf5fde9d41a29b857a70977993171e4579a485bb0c38bd SHA512 788db5fdbb922b82961d0f7ca4a7d05429fe6506624241422ca443d70b6bdac2c4ef1b89dc8ea4b0f4c36a07b700d26c571d70479550556df8b2d949b6c87adb MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9 diff --git a/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch b/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch new file mode 100644 index 000000000000..48d58acaaf7f --- /dev/null +++ b/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch @@ -0,0 +1,56 @@ +From 2ad2713e6cb9166dcede9a020f6913b8189ff0c6 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 23 Nov 2022 04:17:16 +0000 +Subject: [PATCH] Revert "Turn off RWX segment warnings on sparc systems." + +This breaks building on sparc with older binutils. + +This reverts commit 29fd715fd0bdaffee21e2d2d37be8c5a6ac67ee4. +--- a/Makefile.in ++++ b/Makefile.in +@@ -22,7 +22,7 @@ CFLAGS=-O + + SFLAGS=-O + LDFLAGS= +-TEST_LDFLAGS=$(LDFLAGS) -L. libz.a ++TEST_LDFLAGS=-L. libz.a + LDSHARED=$(CC) + CPP=$(CC) -E + +@@ -288,10 +288,10 @@ minigzip$(EXE): minigzip.o $(STATICLIB) + $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) + + examplesh$(EXE): example.o $(SHAREDLIBV) +- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV) ++ $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV) + + minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) +- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV) ++ $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV) + + example64$(EXE): example64.o $(STATICLIB) + $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) +--- a/configure ++++ b/configure +@@ -33,10 +33,7 @@ fi + # set command prefix for cross-compilation + if [ -n "${CHOST}" ]; then + uname=${CHOST} +- mname=${CHOST} + CROSS_PREFIX="${CHOST}-" +-else +- mname=`(uname -a || echo unknown) 2>/dev/null` + fi + + # destination name for static library +@@ -223,10 +220,6 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then + fi + case "$uname" in + Linux* | linux* | *-linux* | GNU | GNU/* | solaris*) +- case "$mname" in +- *sparc*) +- LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;; +- esac + LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;; + *BSD | *bsd* | DragonFly) + LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild b/sys-libs/zlib/zlib-1.2.13-r1.ebuild index ee60673a59b8..50b767a0ef31 100644 --- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild +++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild @@ -6,7 +6,7 @@ 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 +inherit autotools multilib-minimal flag-o-matic 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" @@ -43,6 +43,9 @@ PATCHES=( # Respect LDFLAGS during configure tests. Pending upstream "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch + + # Fix building on sparc with older binutils, we pass it in ebuild instead + "${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch ) src_prepare() { @@ -85,6 +88,10 @@ src_prepare() { echoit() { echo "$@"; "$@"; } multilib_src_configure() { + # We pass manually instead of relying on the configure script/makefile + # because it would pass it even for older binutils. + use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments) + case ${CHOST} in *-mingw*|mingw*|*-cygwin*) ;; |