commit: b599039e3ddc796b26c058598ff1c42f8f522f87
Author: Lei Zhang <zhanglei.april <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 07:01:24 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 1 21:49:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b599039e
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
...ibcxxrt-0.0_p20150423.ebuild => libcxxrt-0.0_p20150423-r1.ebuild} | 5 +++--
sys-libs/libcxxrt/libcxxrt-9999.ebuild | 5 +++--
sys-libs/libcxxrt/metadata.xml | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
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 49a0359..bcb21bd 100644
--- 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 49a0359..7e91e3c 100644
--- 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 6e4e29a..6ccba5c 100644
--- 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>
