| 1 |
commit: adb9a35721e67faab0c5a75f31e38e8791e2f43b |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 28 12:18:16 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 28 12:23:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb9a357 |
| 7 |
|
| 8 |
Revert "sys-libs/zlib: add patch to fix configure AR/RANLIB/NM detection" |
| 9 |
|
| 10 |
Broken if NM is unset. Looks like a simple fix but |
| 11 |
let's not risk leaving zlib broken in stable (nor for |
| 12 |
too long, so reverting myself). |
| 13 |
|
| 14 |
This reverts commit bace9b48a6fe43bdf685f4aa81ca422130e2f807. |
| 15 |
|
| 16 |
Bug: https://bugs.gentoo.org/831628 |
| 17 |
Closes: https://bugs.gentoo.org/832202 |
| 18 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 19 |
|
| 20 |
...2.11-configure-fix-AR-RANLIB-NM-detection.patch | 79 ---------------------- |
| 21 |
sys-libs/zlib/zlib-1.2.11-r4.ebuild | 1 - |
| 22 |
2 files changed, 80 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sys-libs/zlib/files/zlib-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch b/sys-libs/zlib/files/zlib-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch |
| 25 |
deleted file mode 100644 |
| 26 |
index 68108a16fc3c..000000000000 |
| 27 |
--- a/sys-libs/zlib/files/zlib-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch |
| 28 |
+++ /dev/null |
| 29 |
@@ -1,79 +0,0 @@ |
| 30 |
-From 9ce4e2e190cd382407eb3029b7127e378a7c9627 Mon Sep 17 00:00:00 2001 |
| 31 |
-From: Adrian Ratiu <adrian.ratiu@×××××××××.com> |
| 32 |
-Date: Mon, 17 Jan 2022 10:49:58 +0200 |
| 33 |
-Subject: [PATCH] configure: fix AR/RANLIB/NM detection |
| 34 |
- |
| 35 |
-Taken from zlib-devel ML: |
| 36 |
-https://madler.net/pipermail/zlib-devel_madler.net/2022-January/003322.html |
| 37 |
- |
| 38 |
-Bug: https://bugs.gentoo.org/831628 |
| 39 |
- |
| 40 |
-Scenarios where ${CROSS_PREFIX}ar & co are set but not desired |
| 41 |
-are possible, for example in ChromiumOS we use the GNU binutils |
| 42 |
-tools & GCC to build glibc but LLVM/Clang is used for the rest |
| 43 |
-of the system. |
| 44 |
- |
| 45 |
-This allows $AR/$RANLIB/$NM to override default CROSS_PREFIX |
| 46 |
-tools so they can be set to llvm-ar/ranlib/nm. |
| 47 |
- |
| 48 |
-Suggested-by: Manoj Gupta <manojgupta@××××××××.org> |
| 49 |
-Signed-off-by: Adrian Ratiu <adrian.ratiu@×××××××××.com> |
| 50 |
---- |
| 51 |
- configure | 38 ++++++++++++++++++++++---------------- |
| 52 |
- 1 file changed, 22 insertions(+), 16 deletions(-) |
| 53 |
- |
| 54 |
-diff --git a/configure b/configure |
| 55 |
-index e974d1f..180cf09 100755 |
| 56 |
---- a/configure |
| 57 |
-+++ b/configure |
| 58 |
-@@ -46,25 +46,31 @@ VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib. |
| 59 |
- VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h` |
| 60 |
- |
| 61 |
- # establish commands for library building |
| 62 |
--if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
| 63 |
-- AR=${AR-"${CROSS_PREFIX}ar"} |
| 64 |
-- test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log |
| 65 |
--else |
| 66 |
-- AR=${AR-"ar"} |
| 67 |
-- test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log |
| 68 |
-+if [ -z "AR" ] ; then |
| 69 |
-+ if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
| 70 |
-+ AR=${AR-"${CROSS_PREFIX}ar"} |
| 71 |
-+ test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log |
| 72 |
-+ else |
| 73 |
-+ AR="ar" |
| 74 |
-+ test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log |
| 75 |
-+ fi |
| 76 |
- fi |
| 77 |
- ARFLAGS=${ARFLAGS-"rc"} |
| 78 |
--if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
| 79 |
-- RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"} |
| 80 |
-- test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log |
| 81 |
--else |
| 82 |
-- RANLIB=${RANLIB-"ranlib"} |
| 83 |
-+if [ -z "RANLIB" ] ; then |
| 84 |
-+ if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
| 85 |
-+ RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"} |
| 86 |
-+ test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log |
| 87 |
-+ else |
| 88 |
-+ RANLIB="ranlib" |
| 89 |
-+ fi |
| 90 |
- fi |
| 91 |
--if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
| 92 |
-- NM=${NM-"${CROSS_PREFIX}nm"} |
| 93 |
-- test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log |
| 94 |
--else |
| 95 |
-- NM=${NM-"nm"} |
| 96 |
-+if [ -z "$NM" ] ; then |
| 97 |
-+ if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
| 98 |
-+ NM=${"${CROSS_PREFIX}nm"} |
| 99 |
-+ test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log |
| 100 |
-+ else |
| 101 |
-+ NM="nm" |
| 102 |
-+ fi |
| 103 |
- fi |
| 104 |
- |
| 105 |
- # set defaults before processing command line options |
| 106 |
--- |
| 107 |
-2.34.1 |
| 108 |
- |
| 109 |
|
| 110 |
diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild |
| 111 |
index 3b8524a12c6e..bc2fe9834ee2 100644 |
| 112 |
--- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild |
| 113 |
+++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild |
| 114 |
@@ -34,7 +34,6 @@ DEPEND="${RDEPEND}" |
| 115 |
PATCHES=( |
| 116 |
"${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch |
| 117 |
"${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch #658536 |
| 118 |
- "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch #831628 |
| 119 |
) |
| 120 |
|
| 121 |
src_prepare() { |
Archives