| 1 |
commit: cd0a0f16ebdc4cf2d18378213d8476aeb42ff810 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 29 01:59:47 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 29 02:00:40 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd0a0f16 |
| 7 |
|
| 8 |
sys-libs/zlib: keyword 1.2.12-r1 |
| 9 |
|
| 10 |
Issues are fixed now. Nothing else has come up other than the now-fixed |
| 11 |
CC-configure issue. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/835958 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch | 6 ++++-- |
| 17 |
sys-libs/zlib/zlib-1.2.12-r1.ebuild | 2 +- |
| 18 |
2 files changed, 5 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch b/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch |
| 21 |
index 8b6c5e26a766..7fb13325b114 100644 |
| 22 |
--- a/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch |
| 23 |
+++ b/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
https://github.com/madler/zlib/pull/607 |
| 26 |
|
| 27 |
-From c9b7587ff947638412a69df5ea820c563b8b1c1b Mon Sep 17 00:00:00 2001 |
| 28 |
+From 80d086357a55b94a13e43756cf3e131f25eef0e4 Mon Sep 17 00:00:00 2001 |
| 29 |
From: Sam James <sam@g.o> |
| 30 |
Date: Mon, 28 Mar 2022 08:40:45 +0100 |
| 31 |
Subject: [PATCH] Fix CC logic in configure |
| 32 |
@@ -10,6 +10,9 @@ the logic was changed to try check harder for GCC, but it dropped |
| 33 |
the default setting of cc=${CC}. It was throwing away any pre-set CC value as |
| 34 |
a result. |
| 35 |
|
| 36 |
+The rest of the script then cascades down a bad path because it's convinced |
| 37 |
+it's not GCC or a GCC-like compiler. |
| 38 |
+ |
| 39 |
This led to e.g. misdetection of inability to build shared libs |
| 40 |
for say, multilib cases (w/ CC being one thing from the environment being used |
| 41 |
for one test (e.g. x86_64-unknown-linux-gnu-gcc -m32 and then 'cc' used for |
| 42 |
@@ -40,4 +43,3 @@ index 52ff4a04e..3fa3e8618 100755 |
| 43 |
cflags=${CFLAGS-"-O3"} |
| 44 |
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure |
| 45 |
case "$cc" in |
| 46 |
- |
| 47 |
|
| 48 |
diff --git a/sys-libs/zlib/zlib-1.2.12-r1.ebuild b/sys-libs/zlib/zlib-1.2.12-r1.ebuild |
| 49 |
index 1a031b3c2526..267b24c0d148 100644 |
| 50 |
--- a/sys-libs/zlib/zlib-1.2.12-r1.ebuild |
| 51 |
+++ b/sys-libs/zlib/zlib-1.2.12-r1.ebuild |
| 52 |
@@ -22,7 +22,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz |
| 53 |
|
| 54 |
LICENSE="ZLIB" |
| 55 |
SLOT="0/1" # subslot = SONAME |
| 56 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" |
| 57 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" |
| 58 |
IUSE="minizip static-libs" |
| 59 |
|
| 60 |
RDEPEND="!sys-libs/zlib-ng[compat]" |
Archives