| 1 |
commit: b235a2470ee34d41f4aa93bd7960a1d6297c7c68 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 4 21:02:56 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 4 21:10:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b235a247 |
| 7 |
|
| 8 |
sys-libs/libcxx: Fix finding libsupc++ ABI headers for multilib |
| 9 |
|
| 10 |
Fix the logic determining path to libsupc++ ABI headers to avoid being |
| 11 |
affected by CHOST alterations done as part of multilib logic. |
| 12 |
|
| 13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-libs/libcxx/libcxx-3.9.1.ebuild | 8 +++++++- |
| 16 |
sys-libs/libcxx/libcxx-4.0.1.ebuild | 8 +++++++- |
| 17 |
sys-libs/libcxx/libcxx-5.0.2.ebuild | 8 +++++++- |
| 18 |
sys-libs/libcxx/libcxx-6.0.1.ebuild | 8 +++++++- |
| 19 |
sys-libs/libcxx/libcxx-7.0.0.ebuild | 8 +++++++- |
| 20 |
sys-libs/libcxx/libcxx-7.0.9999.ebuild | 8 +++++++- |
| 21 |
sys-libs/libcxx/libcxx-9999.ebuild | 8 +++++++- |
| 22 |
7 files changed, 49 insertions(+), 7 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sys-libs/libcxx/libcxx-3.9.1.ebuild b/sys-libs/libcxx/libcxx-3.9.1.ebuild |
| 25 |
index e847a9f5d31..d5282680825 100644 |
| 26 |
--- a/sys-libs/libcxx/libcxx-3.9.1.ebuild |
| 27 |
+++ b/sys-libs/libcxx/libcxx-3.9.1.ebuild |
| 28 |
@@ -86,7 +86,9 @@ src_configure() { |
| 29 |
cmake-multilib_src_configure |
| 30 |
} |
| 31 |
|
| 32 |
-multilib_src_configure() { |
| 33 |
+src_configure() { |
| 34 |
+ # note: we need to do this before multilib kicks in since it will |
| 35 |
+ # alter the CHOST |
| 36 |
local cxxabi cxxabi_incs |
| 37 |
if use libcxxabi; then |
| 38 |
cxxabi=libcxxabi |
| 39 |
@@ -100,6 +102,10 @@ multilib_src_configure() { |
| 40 |
cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
| 41 |
fi |
| 42 |
|
| 43 |
+ multilib-minimal_src_configure |
| 44 |
+} |
| 45 |
+ |
| 46 |
+multilib_src_configure() { |
| 47 |
# we want -lgcc_s for unwinder, and for compiler runtime when using |
| 48 |
# gcc, clang with gcc runtime (or any unknown compiler) |
| 49 |
local extra_libs=() want_gcc_s=ON |
| 50 |
|
| 51 |
diff --git a/sys-libs/libcxx/libcxx-4.0.1.ebuild b/sys-libs/libcxx/libcxx-4.0.1.ebuild |
| 52 |
index 64f610ce5bb..4273ce8d76e 100644 |
| 53 |
--- a/sys-libs/libcxx/libcxx-4.0.1.ebuild |
| 54 |
+++ b/sys-libs/libcxx/libcxx-4.0.1.ebuild |
| 55 |
@@ -71,7 +71,9 @@ pkg_setup() { |
| 56 |
fi |
| 57 |
} |
| 58 |
|
| 59 |
-multilib_src_configure() { |
| 60 |
+src_configure() { |
| 61 |
+ # note: we need to do this before multilib kicks in since it will |
| 62 |
+ # alter the CHOST |
| 63 |
local cxxabi cxxabi_incs |
| 64 |
if use libcxxabi; then |
| 65 |
cxxabi=libcxxabi |
| 66 |
@@ -85,6 +87,10 @@ multilib_src_configure() { |
| 67 |
cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
| 68 |
fi |
| 69 |
|
| 70 |
+ multilib-minimal_src_configure |
| 71 |
+} |
| 72 |
+ |
| 73 |
+multilib_src_configure() { |
| 74 |
# we want -lgcc_s for unwinder, and for compiler runtime when using |
| 75 |
# gcc, clang with gcc runtime (or any unknown compiler) |
| 76 |
local extra_libs=() want_gcc_s=ON |
| 77 |
|
| 78 |
diff --git a/sys-libs/libcxx/libcxx-5.0.2.ebuild b/sys-libs/libcxx/libcxx-5.0.2.ebuild |
| 79 |
index bd65e51b774..eda78625c06 100644 |
| 80 |
--- a/sys-libs/libcxx/libcxx-5.0.2.ebuild |
| 81 |
+++ b/sys-libs/libcxx/libcxx-5.0.2.ebuild |
| 82 |
@@ -71,7 +71,9 @@ pkg_setup() { |
| 83 |
fi |
| 84 |
} |
| 85 |
|
| 86 |
-multilib_src_configure() { |
| 87 |
+src_configure() { |
| 88 |
+ # note: we need to do this before multilib kicks in since it will |
| 89 |
+ # alter the CHOST |
| 90 |
local cxxabi cxxabi_incs |
| 91 |
if use libcxxabi; then |
| 92 |
cxxabi=libcxxabi |
| 93 |
@@ -85,6 +87,10 @@ multilib_src_configure() { |
| 94 |
cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
| 95 |
fi |
| 96 |
|
| 97 |
+ multilib-minimal_src_configure |
| 98 |
+} |
| 99 |
+ |
| 100 |
+multilib_src_configure() { |
| 101 |
# we want -lgcc_s for unwinder, and for compiler runtime when using |
| 102 |
# gcc, clang with gcc runtime (or any unknown compiler) |
| 103 |
local extra_libs=() want_gcc_s=ON |
| 104 |
|
| 105 |
diff --git a/sys-libs/libcxx/libcxx-6.0.1.ebuild b/sys-libs/libcxx/libcxx-6.0.1.ebuild |
| 106 |
index 6c5c866f9c6..5d8314c5988 100644 |
| 107 |
--- a/sys-libs/libcxx/libcxx-6.0.1.ebuild |
| 108 |
+++ b/sys-libs/libcxx/libcxx-6.0.1.ebuild |
| 109 |
@@ -78,7 +78,9 @@ test_compiler() { |
| 110 |
<<<'int main() { return 0; }' &>/dev/null |
| 111 |
} |
| 112 |
|
| 113 |
-multilib_src_configure() { |
| 114 |
+src_configure() { |
| 115 |
+ # note: we need to do this before multilib kicks in since it will |
| 116 |
+ # alter the CHOST |
| 117 |
local cxxabi cxxabi_incs |
| 118 |
if use libcxxabi; then |
| 119 |
cxxabi=libcxxabi |
| 120 |
@@ -92,6 +94,10 @@ multilib_src_configure() { |
| 121 |
cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
| 122 |
fi |
| 123 |
|
| 124 |
+ multilib-minimal_src_configure |
| 125 |
+} |
| 126 |
+ |
| 127 |
+multilib_src_configure() { |
| 128 |
# we want -lgcc_s for unwinder, and for compiler runtime when using |
| 129 |
# gcc, clang with gcc runtime (or any unknown compiler) |
| 130 |
local extra_libs=() want_gcc_s=ON |
| 131 |
|
| 132 |
diff --git a/sys-libs/libcxx/libcxx-7.0.0.ebuild b/sys-libs/libcxx/libcxx-7.0.0.ebuild |
| 133 |
index 3a997e98c08..d94f0c1c617 100644 |
| 134 |
--- a/sys-libs/libcxx/libcxx-7.0.0.ebuild |
| 135 |
+++ b/sys-libs/libcxx/libcxx-7.0.0.ebuild |
| 136 |
@@ -78,7 +78,9 @@ test_compiler() { |
| 137 |
<<<'int main() { return 0; }' &>/dev/null |
| 138 |
} |
| 139 |
|
| 140 |
-multilib_src_configure() { |
| 141 |
+src_configure() { |
| 142 |
+ # note: we need to do this before multilib kicks in since it will |
| 143 |
+ # alter the CHOST |
| 144 |
local cxxabi cxxabi_incs |
| 145 |
if use libcxxabi; then |
| 146 |
cxxabi=libcxxabi |
| 147 |
@@ -92,6 +94,10 @@ multilib_src_configure() { |
| 148 |
cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
| 149 |
fi |
| 150 |
|
| 151 |
+ multilib-minimal_src_configure |
| 152 |
+} |
| 153 |
+ |
| 154 |
+multilib_src_configure() { |
| 155 |
# we want -lgcc_s for unwinder, and for compiler runtime when using |
| 156 |
# gcc, clang with gcc runtime (or any unknown compiler) |
| 157 |
local extra_libs=() want_gcc_s=ON |
| 158 |
|
| 159 |
diff --git a/sys-libs/libcxx/libcxx-7.0.9999.ebuild b/sys-libs/libcxx/libcxx-7.0.9999.ebuild |
| 160 |
index e5777074eed..536457a1380 100644 |
| 161 |
--- a/sys-libs/libcxx/libcxx-7.0.9999.ebuild |
| 162 |
+++ b/sys-libs/libcxx/libcxx-7.0.9999.ebuild |
| 163 |
@@ -90,7 +90,9 @@ test_compiler() { |
| 164 |
<<<'int main() { return 0; }' &>/dev/null |
| 165 |
} |
| 166 |
|
| 167 |
-multilib_src_configure() { |
| 168 |
+src_configure() { |
| 169 |
+ # note: we need to do this before multilib kicks in since it will |
| 170 |
+ # alter the CHOST |
| 171 |
local cxxabi cxxabi_incs |
| 172 |
if use libcxxabi; then |
| 173 |
cxxabi=libcxxabi |
| 174 |
@@ -104,6 +106,10 @@ multilib_src_configure() { |
| 175 |
cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
| 176 |
fi |
| 177 |
|
| 178 |
+ multilib-minimal_src_configure |
| 179 |
+} |
| 180 |
+ |
| 181 |
+multilib_src_configure() { |
| 182 |
# we want -lgcc_s for unwinder, and for compiler runtime when using |
| 183 |
# gcc, clang with gcc runtime (or any unknown compiler) |
| 184 |
local extra_libs=() want_gcc_s=ON |
| 185 |
|
| 186 |
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild |
| 187 |
index 4272b211794..2547da3dfa7 100644 |
| 188 |
--- a/sys-libs/libcxx/libcxx-9999.ebuild |
| 189 |
+++ b/sys-libs/libcxx/libcxx-9999.ebuild |
| 190 |
@@ -89,7 +89,9 @@ test_compiler() { |
| 191 |
<<<'int main() { return 0; }' &>/dev/null |
| 192 |
} |
| 193 |
|
| 194 |
-multilib_src_configure() { |
| 195 |
+src_configure() { |
| 196 |
+ # note: we need to do this before multilib kicks in since it will |
| 197 |
+ # alter the CHOST |
| 198 |
local cxxabi cxxabi_incs |
| 199 |
if use libcxxabi; then |
| 200 |
cxxabi=libcxxabi |
| 201 |
@@ -103,6 +105,10 @@ multilib_src_configure() { |
| 202 |
cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
| 203 |
fi |
| 204 |
|
| 205 |
+ multilib-minimal_src_configure |
| 206 |
+} |
| 207 |
+ |
| 208 |
+multilib_src_configure() { |
| 209 |
# we want -lgcc_s for unwinder, and for compiler runtime when using |
| 210 |
# gcc, clang with gcc runtime (or any unknown compiler) |
| 211 |
local extra_libs=() want_gcc_s=ON |
Archives