diff options
| author |   Lei Zhang <zhanglei.april@gmail.com> | 2016-07-19 15:01:24 +0800 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2016-08-01 23:49:26 +0200 |
| commit | b599039e3ddc796b26c058598ff1c42f8f522f87 (patch) | |
| tree | dc551be74d77bf2dc3c039f62e9cb460234e9b95 /sys-libs/libcxxrt | |
| parent | sys-libs/llvm-libunwind: new package (diff) | |
| download | gentoo-b599039e3ddc796b26c058598ff1c42f8f522f87.tar.gz gentoo-b599039e3ddc796b26c058598ff1c42f8f522f87.tar.bz2 gentoo-b599039e3ddc796b26c058598ff1c42f8f522f87.zip | |
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
Diffstat (limited to 'sys-libs/libcxxrt')
| -rw-r--r-- | sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild (renamed from sys-libs/libcxxrt/libcxxrt-0.0_p20150423.ebuild) | 5 | ||||
| -rw-r--r-- | sys-libs/libcxxrt/libcxxrt-9999.ebuild | 5 | ||||
| -rw-r--r-- | 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 index 49a035949027..bcb21bd8e197 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 49a035949027..7e91e3c9ec8f 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 6e4e29a33ef0..6ccba5c3bae4 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> |