| 1 |
commit: b599039e3ddc796b26c058598ff1c42f8f522f87 |
| 2 |
Author: Lei Zhang <zhanglei.april <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jul 19 07:01:24 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 1 21:49:26 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b599039e |
| 7 |
|
| 8 |
sys-libs/libcxxrt: add support for llvm-libunwind |
| 9 |
|
| 10 |
There are two implementations of libunwind, one from nongnu and another from |
| 11 |
LLVM. This commit allows libcxxrt to be built against LLVM's version. |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.28 |
| 14 |
|
| 15 |
...ibcxxrt-0.0_p20150423.ebuild => libcxxrt-0.0_p20150423-r1.ebuild} | 5 +++-- |
| 16 |
sys-libs/libcxxrt/libcxxrt-9999.ebuild | 5 +++-- |
| 17 |
sys-libs/libcxxrt/metadata.xml | 2 +- |
| 18 |
3 files changed, 7 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20150423.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild |
| 21 |
similarity index 92% |
| 22 |
rename from sys-libs/libcxxrt/libcxxrt-0.0_p20150423.ebuild |
| 23 |
rename to sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild |
| 24 |
index 49a0359..bcb21bd 100644 |
| 25 |
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20150423.ebuild |
| 26 |
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild |
| 27 |
@@ -1,4 +1,4 @@ |
| 28 |
-# Copyright 1999-2015 Gentoo Foundation |
| 29 |
+# Copyright 1999-2016 Gentoo Foundation |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
# $Id$ |
| 32 |
|
| 33 |
@@ -28,7 +28,8 @@ else |
| 34 |
fi |
| 35 |
IUSE="libunwind +static-libs" |
| 36 |
|
| 37 |
-RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )" |
| 38 |
+RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] |
| 39 |
+ sys-libs/llvm-libunwind[static-libs?] ) )" |
| 40 |
DEPEND="${RDEPEND} |
| 41 |
${DEPEND}" |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild |
| 45 |
index 49a0359..7e91e3c 100644 |
| 46 |
--- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild |
| 47 |
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild |
| 48 |
@@ -1,4 +1,4 @@ |
| 49 |
-# Copyright 1999-2015 Gentoo Foundation |
| 50 |
+# Copyright 1999-2016 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Id$ |
| 53 |
|
| 54 |
@@ -28,7 +28,8 @@ else |
| 55 |
fi |
| 56 |
IUSE="libunwind +static-libs" |
| 57 |
|
| 58 |
-RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )" |
| 59 |
+RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] |
| 60 |
+ sys-libs/llvm-libunwind[static-libs?] ) )" |
| 61 |
DEPEND="${RDEPEND} |
| 62 |
${DEPEND}" |
| 63 |
|
| 64 |
|
| 65 |
diff --git a/sys-libs/libcxxrt/metadata.xml b/sys-libs/libcxxrt/metadata.xml |
| 66 |
index 6e4e29a..6ccba5c 100644 |
| 67 |
--- a/sys-libs/libcxxrt/metadata.xml |
| 68 |
+++ b/sys-libs/libcxxrt/metadata.xml |
| 69 |
@@ -10,7 +10,7 @@ |
| 70 |
<name>BSD Project</name> |
| 71 |
</maintainer> |
| 72 |
<use> |
| 73 |
- <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> |
| 74 |
+ <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> |
| 75 |
</use> |
| 76 |
<upstream> |
| 77 |
<remote-id type="github">pathscale/libcxxrt</remote-id> |
Archives