sys-libs/libcxxrt: add support for llvm-libunwind

There are two implementations of libunwind, one from nongnu and another from
LLVM. This commit allows libcxxrt to be built against LLVM's version.

Package-Manager: portage-2.2.28

diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20150423.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild
similarity index 92%
rename from sys-libs/libcxxrt/libcxxrt-0.0_p20150423.ebuild
rename to sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild
index 49a035949027acaea847941dd6a53773437aa979..bcb21bd8e197029bb50aac89a35e5f2fb0f19655 100644 (file)
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20150423.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,7 +28,8 @@ else
 fi
 IUSE="libunwind +static-libs"
 
-RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )"
+RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?]
+       sys-libs/llvm-libunwind[static-libs?] ) )"
 DEPEND="${RDEPEND}
        ${DEPEND}"
 

diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
index 49a035949027acaea847941dd6a53773437aa979..7e91e3c9ec8fbd20d21931cc3bc0ab9dc0c73a65 100644 (file)
--- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,7 +28,8 @@ else
 fi
 IUSE="libunwind +static-libs"
 
-RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )"
+RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?]
+               sys-libs/llvm-libunwind[static-libs?] ) )"
 DEPEND="${RDEPEND}
        ${DEPEND}"
 

diff --git a/sys-libs/libcxxrt/metadata.xml b/sys-libs/libcxxrt/metadata.xml
index 6e4e29a33ef0c5edeb30f15ef3952ec65d64e614..6ccba5c3bae4cd800977febae74e1fd48ef425d4 100644 (file)
--- a/sys-libs/libcxxrt/metadata.xml
+++ b/sys-libs/libcxxrt/metadata.xml
@@ -10,7 +10,7 @@
     <name>BSD Project</name>
   </maintainer>
   <use>
-    <flag name="libunwind">Use <pkg>sys-libs/libunwind</pkg> instead of libgcc_s for unwinding. This should allow avoiding relying on <pkg>sys-devel/gcc</pkg> but for now clang is setup to use libgcc_s.</flag>
+    <flag name="libunwind">Use libunwind instead of libgcc_s for unwinding. This should allow avoiding relying on <pkg>sys-devel/gcc</pkg> but for now clang is setup to use libgcc_s.</flag>
   </use>
   <upstream>
     <remote-id type="github">pathscale/libcxxrt</remote-id>