sys-devel/llvm: fix dependency on libcxx for Darwin, bug #573176

llvm dies with an ICE while compiling packages (like itself) when the version of libcxx doesn't match.  So pull in a version from the same major range.

Package-Manager: portage-2.2.20-prefix

diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index f6bb2c37914c8d8f63a65a303e1b14fda2c796bf..d051a7ab4d089be9fecd0517ebd3f1ff5a14db51 100644 (file)
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -50,7 +50,7 @@ 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 )
+       kernel_Darwin? ( =sys-libs/libcxx-3.5* )
        clang? ( xml? ( virtual/pkgconfig ) )
        doc? ( dev-python/sphinx )
        libffi? ( virtual/pkgconfig )

diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild
index 21f4f9df756d5e528483cb1dfc39e93ee88bbb68..2e59d43440e767b77162df314ff621c80be05324 100644 (file)
--- a/sys-devel/llvm/llvm-3.6.2.ebuild
+++ b/sys-devel/llvm/llvm-3.6.2.ebuild
@@ -53,7 +53,7 @@ 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 )
+       kernel_Darwin? ( =sys-libs/libcxx-3.6* )
        clang? ( xml? ( virtual/pkgconfig ) )
        doc? ( dev-python/sphinx )
        libffi? ( virtual/pkgconfig )

diff --git a/sys-devel/llvm/llvm-3.7.1.ebuild b/sys-devel/llvm/llvm-3.7.1.ebuild
index 6aa2ef22c63fc7a2e7c757087a7c75193981ac7b..6afc7e9ae09efca5d1f6dc071932c76e7da51d39 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.1.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1.ebuild
@@ -55,7 +55,7 @@ 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 )
+       kernel_Darwin? ( =sys-libs/libcxx-3.7* )
        clang? ( xml? ( virtual/pkgconfig ) )
        doc? ( dev-python/sphinx )
        gold? ( sys-libs/binutils-libs )