[gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/

[Michał Górny]

commit:     7e4620701ae0f56afb758bbe417e91e4d1b49e79
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 11:50:59 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 11:56:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e462070

sys-libs/libcxx: Use CMake files from native LLVM build

 sys-libs/libcxx/libcxx-3.9.0.ebuild | 12 ++++++++++--
 sys-libs/libcxx/libcxx-9999.ebuild  | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/sys-libs/libcxx/libcxx-3.9.0.ebuild 
b/sys-libs/libcxx/libcxx-3.9.0.ebuild
index 25e0b69..d466c0f 100644
--- a/sys-libs/libcxx/libcxx-3.9.0.ebuild
+++ b/sys-libs/libcxx/libcxx-3.9.0.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
        test? ( sys-devel/clang[${MULTILIB_USEDEP}]
                ${PYTHON_DEPS} )
        app-arch/xz-utils
-       >=sys-devel/llvm-3.9.0[${MULTILIB_USEDEP}]"
+       >=sys-devel/llvm-3.9.0"
 
 DOCS=( CREDITS.TXT )
 
@@ -94,6 +94,11 @@ src_unpack() {
        git-r3_checkout
 }
 
+src_configure() {
+       NATIVE_LIBDIR=$(get_libdir)
+       cmake-multilib_src_configure
+}
+
 multilib_src_configure() {
        local cxxabi cxxabi_incs
        if use libcxxrt; then
@@ -107,7 +112,10 @@ multilib_src_configure() {
 
        local libdir=$(get_libdir)
        local mycmakeargs=(
-               -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+               # LLVM_LIBDIR_SUFFIX is used to find CMake files
+               # and we are happy to use the native set
+               -DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
+               -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
                -DLIBCXX_ENABLE_SHARED=ON
                -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
                -DLIBCXX_CXX_ABI=${cxxabi}

diff --git a/sys-libs/libcxx/libcxx-9999.ebuild 
b/sys-libs/libcxx/libcxx-9999.ebuild
index dc867aa..7f444c7 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
        test? ( sys-devel/clang[${MULTILIB_USEDEP}]
                ${PYTHON_DEPS} )
        app-arch/xz-utils
-       >=sys-devel/llvm-3.9.0[${MULTILIB_USEDEP}]"
+       >=sys-devel/llvm-3.9.0"
 
 DOCS=( CREDITS.TXT )
 
@@ -90,6 +90,11 @@ src_unpack() {
        git-r3_checkout
 }
 
+src_configure() {
+       NATIVE_LIBDIR=$(get_libdir)
+       cmake-multilib_src_configure
+}
+
 multilib_src_configure() {
        local cxxabi cxxabi_incs
        if use libcxxrt; then
@@ -103,7 +108,10 @@ multilib_src_configure() {
 
        local libdir=$(get_libdir)
        local mycmakeargs=(
-               -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+               # LLVM_LIBDIR_SUFFIX is used to find CMake files
+               # and we are happy to use the native set
+               -DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
+               -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
                -DLIBCXX_ENABLE_SHARED=ON
                -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
                -DLIBCXX_CXX_ABI=${cxxabi}