sys-libs/libcxx: Fix finding libsupc++ ABI headers for multilib

Fix the logic determining path to libsupc++ ABI headers to avoid being
affected by CHOST alterations done as part of multilib logic.

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/sys-libs/libcxx/libcxx-3.9.1.ebuild b/sys-libs/libcxx/libcxx-3.9.1.ebuild
index e847a9f5d3184a3723ccf393045fb9239b5dc26c..d5282680825bbbc5b8e7914c638b6d3231f511bc 100644 (file)
--- a/sys-libs/libcxx/libcxx-3.9.1.ebuild
+++ b/sys-libs/libcxx/libcxx-3.9.1.ebuild
@@ -86,7 +86,9 @@ src_configure() {
        cmake-multilib_src_configure
 }
 
-multilib_src_configure() {
+src_configure() {
+       # note: we need to do this before multilib kicks in since it will
+       # alter the CHOST
        local cxxabi cxxabi_incs
        if use libcxxabi; then
                cxxabi=libcxxabi
@@ -100,6 +102,10 @@ multilib_src_configure() {
                cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
        fi
 
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
        # we want -lgcc_s for unwinder, and for compiler runtime when using
        # gcc, clang with gcc runtime (or any unknown compiler)
        local extra_libs=() want_gcc_s=ON

diff --git a/sys-libs/libcxx/libcxx-4.0.1.ebuild b/sys-libs/libcxx/libcxx-4.0.1.ebuild
index 64f610ce5bb2b9dfdd6904c628cf1fce51c0a635..4273ce8d76ecbb55b206798946e952ebaa4e83ef 100644 (file)
--- a/sys-libs/libcxx/libcxx-4.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-4.0.1.ebuild
@@ -71,7 +71,9 @@ pkg_setup() {
        fi
 }
 
-multilib_src_configure() {
+src_configure() {
+       # note: we need to do this before multilib kicks in since it will
+       # alter the CHOST
        local cxxabi cxxabi_incs
        if use libcxxabi; then
                cxxabi=libcxxabi
@@ -85,6 +87,10 @@ multilib_src_configure() {
                cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
        fi
 
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
        # we want -lgcc_s for unwinder, and for compiler runtime when using
        # gcc, clang with gcc runtime (or any unknown compiler)
        local extra_libs=() want_gcc_s=ON

diff --git a/sys-libs/libcxx/libcxx-5.0.2.ebuild b/sys-libs/libcxx/libcxx-5.0.2.ebuild
index bd65e51b774bf2778dcc3885f255e68cffeafceb..eda78625c067416b35bb8925c4226345f696303a 100644 (file)
--- a/sys-libs/libcxx/libcxx-5.0.2.ebuild
+++ b/sys-libs/libcxx/libcxx-5.0.2.ebuild
@@ -71,7 +71,9 @@ pkg_setup() {
        fi
 }
 
-multilib_src_configure() {
+src_configure() {
+       # note: we need to do this before multilib kicks in since it will
+       # alter the CHOST
        local cxxabi cxxabi_incs
        if use libcxxabi; then
                cxxabi=libcxxabi
@@ -85,6 +87,10 @@ multilib_src_configure() {
                cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
        fi
 
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
        # we want -lgcc_s for unwinder, and for compiler runtime when using
        # gcc, clang with gcc runtime (or any unknown compiler)
        local extra_libs=() want_gcc_s=ON

diff --git a/sys-libs/libcxx/libcxx-6.0.1.ebuild b/sys-libs/libcxx/libcxx-6.0.1.ebuild
index 6c5c866f9c61a75aca14717f68d9bf150a2cb716..5d8314c5988a9838885c472e78229bea25a6c0b5 100644 (file)
--- a/sys-libs/libcxx/libcxx-6.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.1.ebuild
@@ -78,7 +78,9 @@ test_compiler() {
                <<<'int main() { return 0; }' &>/dev/null
 }
 
-multilib_src_configure() {
+src_configure() {
+       # note: we need to do this before multilib kicks in since it will
+       # alter the CHOST
        local cxxabi cxxabi_incs
        if use libcxxabi; then
                cxxabi=libcxxabi
@@ -92,6 +94,10 @@ multilib_src_configure() {
                cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
        fi
 
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
        # we want -lgcc_s for unwinder, and for compiler runtime when using
        # gcc, clang with gcc runtime (or any unknown compiler)
        local extra_libs=() want_gcc_s=ON

diff --git a/sys-libs/libcxx/libcxx-7.0.0.ebuild b/sys-libs/libcxx/libcxx-7.0.0.ebuild
index 3a997e98c0887058b5c4805d68049766898a4f3d..d94f0c1c617eb2358401a08921c9d21fdd169fcd 100644 (file)
--- a/sys-libs/libcxx/libcxx-7.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-7.0.0.ebuild
@@ -78,7 +78,9 @@ test_compiler() {
                <<<'int main() { return 0; }' &>/dev/null
 }
 
-multilib_src_configure() {
+src_configure() {
+       # note: we need to do this before multilib kicks in since it will
+       # alter the CHOST
        local cxxabi cxxabi_incs
        if use libcxxabi; then
                cxxabi=libcxxabi
@@ -92,6 +94,10 @@ multilib_src_configure() {
                cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
        fi
 
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
        # we want -lgcc_s for unwinder, and for compiler runtime when using
        # gcc, clang with gcc runtime (or any unknown compiler)
        local extra_libs=() want_gcc_s=ON

diff --git a/sys-libs/libcxx/libcxx-7.0.9999.ebuild b/sys-libs/libcxx/libcxx-7.0.9999.ebuild
index e5777074eeda95de76182ec496701c241f4c3046..536457a13802149bcb8c36b3f7a8d018d1845363 100644 (file)
--- a/sys-libs/libcxx/libcxx-7.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-7.0.9999.ebuild
@@ -90,7 +90,9 @@ test_compiler() {
                <<<'int main() { return 0; }' &>/dev/null
 }
 
-multilib_src_configure() {
+src_configure() {
+       # note: we need to do this before multilib kicks in since it will
+       # alter the CHOST
        local cxxabi cxxabi_incs
        if use libcxxabi; then
                cxxabi=libcxxabi
@@ -104,6 +106,10 @@ multilib_src_configure() {
                cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
        fi
 
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
        # we want -lgcc_s for unwinder, and for compiler runtime when using
        # gcc, clang with gcc runtime (or any unknown compiler)
        local extra_libs=() want_gcc_s=ON

diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 4272b2117944fe665d983443568ed4dfa63f691c..2547da3dfa77d34fa72b029e616dad3952bd1f9b 100644 (file)
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -89,7 +89,9 @@ test_compiler() {
                <<<'int main() { return 0; }' &>/dev/null
 }
 
-multilib_src_configure() {
+src_configure() {
+       # note: we need to do this before multilib kicks in since it will
+       # alter the CHOST
        local cxxabi cxxabi_incs
        if use libcxxabi; then
                cxxabi=libcxxabi
@@ -103,6 +105,10 @@ multilib_src_configure() {
                cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
        fi
 
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
        # we want -lgcc_s for unwinder, and for compiler runtime when using
        # gcc, clang with gcc runtime (or any unknown compiler)
        local extra_libs=() want_gcc_s=ON