sys-devel/llvm: move libcxx into PDEPEND for Darwin

llvm needs libcxx-headers at most, but not the library, however, llvm
does segfault if the matching libcxx isn't available at runtime, so make
sure we install a matching version after installing llvm on Darwin.

Package-Manager: portage-2.2.28

diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index a4f1139d49522928f5044416f4c5b81d4f9f08c5..62acb5af863e45e8a04e175576c26180b6c267f6 100644 (file)
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -50,7 +50,6 @@ DEPEND="${COMMON_DEPEND}
                ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
        )
        || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-       kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
        clang? ( xml? ( virtual/pkgconfig ) )
        doc? ( dev-python/sphinx )
        libffi? ( virtual/pkgconfig )
@@ -61,7 +60,8 @@ RDEPEND="${COMMON_DEPEND}
                !>=sys-devel/clang-9999 )
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
+       kernel_Darwin? ( =sys-libs/libcxx-${SLOT#*/}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.

diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index a933eb617f0eb77ab75657ad7f206a826b5bcb95..b8805b0aacf9a5fc1f30b64e6eb3140889cb3fe5 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -55,7 +55,6 @@ DEPEND="${COMMON_DEPEND}
                ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
        )
        || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-       kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
        clang? ( xml? ( virtual/pkgconfig ) )
        doc? ( dev-python/sphinx )
        gold? ( sys-libs/binutils-libs )
@@ -68,7 +67,8 @@ RDEPEND="${COMMON_DEPEND}
        clang? ( !<=sys-devel/clang-${PV}-r99 )
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
+       kernel_Darwin? ( =sys-libs/libcxx-${PV}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.

diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 195d8ec78c89f5e81aa9eb70711ddefbe61d6004..14a2e82d508ce8ddc6be58b0a3c49ed6a0314fab 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -55,7 +55,6 @@ DEPEND="${COMMON_DEPEND}
                ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
        )
        || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-       kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
        clang? ( xml? ( virtual/pkgconfig ) )
        doc? ( dev-python/sphinx )
        gold? ( sys-libs/binutils-libs )
@@ -70,7 +69,8 @@ RDEPEND="${COMMON_DEPEND}
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
 PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
-       default-libcxx? ( sys-libs/libcxx )"
+       default-libcxx? ( sys-libs/libcxx )
+       kernel_Darwin? ( =sys-libs/libcxx-${PV%.*}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.

diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index 4846dcdb9b291bb6c904e76f40742d79f0b37eb9..81d3f0fbe2fb593b6b99c2b7ba01192ee05047ac 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -56,7 +56,6 @@ DEPEND="${COMMON_DEPEND}
                ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
        )
        || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-       kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
        clang? ( xml? ( virtual/pkgconfig ) )
        doc? ( dev-python/sphinx )
        gold? ( sys-libs/binutils-libs )
@@ -69,7 +68,8 @@ RDEPEND="${COMMON_DEPEND}
        clang? ( !<=sys-devel/clang-${PV}-r99 )
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
+       kernel_Darwin? ( =sys-libs/libcxx-${PV%.*}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.

diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild
index ec4ce048623ca24b684a2749bec7a93a2d3eb90d..ae3d20555fd530271d53db665f86e2179a3ff151 100644 (file)
--- a/sys-devel/llvm/llvm-3.9.0.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0.ebuild
@@ -72,7 +72,8 @@ RDEPEND="${COMMON_DEPEND}
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
 PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
-       default-libcxx? ( sys-libs/libcxx )"
+       default-libcxx? ( sys-libs/libcxx )
+       kernel_Darwin? ( =sys-libs/libcxx-${PV%.*}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.