1 |
commit: ffafdfd3eed513c49aa7047f4b09fd1dd0bb6768 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 28 07:42:47 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 28 07:45:45 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffafdfd3 |
7 |
|
8 |
sys-libs/zlib: add link to upstream PR for 1.2.12 configure |
9 |
|
10 |
Bug: https://bugs.gentoo.org/836308 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../zlib-1.2.12-fix-CC-logic-in-configure.patch | 28 +++++++++++++++++----- |
14 |
1 file changed, 22 insertions(+), 6 deletions(-) |
15 |
|
16 |
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 |
17 |
index da9455519b6f..8b6c5e26a766 100644 |
18 |
--- a/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch |
19 |
+++ b/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch |
20 |
@@ -1,20 +1,35 @@ |
21 |
-From 95b9053f10710f9f881f4daec2f2e78da87560cf Mon Sep 17 00:00:00 2001 |
22 |
+https://github.com/madler/zlib/pull/607 |
23 |
+ |
24 |
+From c9b7587ff947638412a69df5ea820c563b8b1c1b Mon Sep 17 00:00:00 2001 |
25 |
From: Sam James <sam@g.o> |
26 |
-Date: Mon, 28 Mar 2022 08:21:18 +0100 |
27 |
+Date: Mon, 28 Mar 2022 08:40:45 +0100 |
28 |
Subject: [PATCH] Fix CC logic in configure |
29 |
|
30 |
In https://github.com/madler/zlib/commit/e9a52aa129efe3834383e415580716a7c4027f8d, |
31 |
the logic was changed to try check harder for GCC, but it dropped |
32 |
-the default setting of cc=${CC}. |
33 |
+the default setting of cc=${CC}. It was throwing away any pre-set CC value as |
34 |
+a result. |
35 |
|
36 |
This led to e.g. misdetection of inability to build shared libs |
37 |
-for say, multilib cases (w/ CC being one thing (e.g. x86_64-unknown-linux-gnu-gcc -m32 |
38 |
-and then 'cc' used for shared libs being w/o -m32). |
39 |
+for say, multilib cases (w/ CC being one thing from the environment being used |
40 |
+for one test (e.g. x86_64-unknown-linux-gnu-gcc -m32 and then 'cc' used for |
41 |
+shared libs (but missing "-m32"!)). Obviously just one example of how |
42 |
+the old logic could break. |
43 |
+ |
44 |
+This restores the old default of 'CC' if nothing overrides it later |
45 |
+in configure. |
46 |
|
47 |
+Bug: https://bugs.gentoo.org/836308 |
48 |
Signed-off-by: Sam James <sam@g.o> |
49 |
+--- |
50 |
+ configure | 3 +++ |
51 |
+ 1 file changed, 3 insertions(+) |
52 |
+ |
53 |
+diff --git a/configure b/configure |
54 |
+index 52ff4a04e..3fa3e8618 100755 |
55 |
--- a/configure |
56 |
+++ b/configure |
57 |
-@@ -180,7 +180,10 @@ if test -z "$CC"; then |
58 |
+@@ -174,7 +174,10 @@ if test -z "$CC"; then |
59 |
else |
60 |
cc=${CROSS_PREFIX}cc |
61 |
fi |
62 |
@@ -25,3 +40,4 @@ Signed-off-by: Sam James <sam@g.o> |
63 |
cflags=${CFLAGS-"-O3"} |
64 |
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure |
65 |
case "$cc" in |
66 |
+ |