Make libunwind usage optional: clang is setup to use libgcc_s so there is no serious point for now in trying to avoid using libgcc_s.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 21 insertions, 14 deletions

diff --git a/sys-libs/libcxxrt/ChangeLog b/sys-libs/libcxxrt/ChangeLog
index 8678985f23de..8d17a0d5215a 100644
--- a/sys-libs/libcxxrt/ChangeLog
+++ b/sys-libs/libcxxrt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libcxxrt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.11 2013/05/31 15:54:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.12 2013/06/01 12:58:41 aballier Exp $
+
+  01 Jun 2013; Alexis Ballier <aballier@gentoo.org> libcxxrt-9999.ebuild,
+  metadata.xml:
+  Make libunwind usage optional: clang is setup to use libgcc_s so there is no
+  serious point for now in trying to avoid using libgcc_s.
 
 *libcxxrt-0.0_p20130531 (31 May 2013)
 
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index 5f078bc06e5e..da6acc71fbc8 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -9,13 +9,13 @@ DIST libcxxrt-0.0_p20130218.tar.xz 57444 SHA256 27e4c7dcec3603631fb2ff8d0bf8f1c6
 DIST libcxxrt-0.0_p20130531.tar.xz 57452 SHA256 7e3bb7b3a5b9695b607e520b561e494c3b946f8949e57f4bc151c56056003cde SHA512 d262a9bd6db60667e1b613bbe794b0d12b86bb641f192848e38654125850b05330e2eec0b020c92e7b6a8f45fe829c53e60ceb7e125214491418fc9edcdce2c1 WHIRLPOOL ab32fb4725da712568361c936e0bad1d43014eac80e2224c904a821d6ff66c3e6a4d2c350c704d69d31f7a50f6f1eae7f7ad7d9621b68ff7c823ffe0d36fdfc7
 EBUILD libcxxrt-0.0_p20130218.ebuild 1896 SHA256 451195f7a967977d5b55ee137e4a4be1dfa8c9317d50896c6986fd2a929853ad SHA512 50872547d64bc72a218ba6f8f4ab3c2010630cd3e0db0db47247704e891db85cc1dd6b9c91298691a269724954d999dd6279042e1487c73b5b086882a0da6246 WHIRLPOOL e5570749aa66389b6c40376aced751061b2f3ea2e5d6f1c8f24c10e4798dd8ab6d821bfcc4661626aa8b6f379edd6f94365caf02ca5876e4b7da59319ea93ebf
 EBUILD libcxxrt-0.0_p20130531.ebuild 1856 SHA256 4a9bb0eddb2995085db271283c4e1749d5a05cee947e03c67a333447bd65723c SHA512 8e80d815ab5c8f9bf504cd1c7d7894bd3b3ab97319940d725f44106abcdbaed277871d4c3be219bef0cacfef8cae52bd8daab2a514141439ec42c07f0b09ea25 WHIRLPOOL e400fe84a5992e1cfe1199b279c442f2bc756f3db9795b0d6652cc5ed6a553ca3fa1eb478bc5146e02610263a5ca911d4fbf5113d2f6df7cb81ae098614a321e
-EBUILD libcxxrt-9999.ebuild 1847 SHA256 b4b16ba05dfe5983cd3ef59e9ecbe0a68d0b70dc803c6e205e2f261c1854197e SHA512 82dddd7908d973c1eb661b656b6e2cbfbc9c04bb310f5e13a4f1d1a760c2c61bab43ef70226fe54122ce94a207c626da560004741970438eb24b35e3677063fe WHIRLPOOL d4b9f24d4a14dc2cdd8e0eb94281641bf22020d571aff1acd45f6fb63b6eceb82d94d2d57b07bd65a9966851f3d075edc0c2ecaf995965de578b7812ace26a26
-MISC ChangeLog 2420 SHA256 5343784cfb456f54cb0cc6ea62774a9efd186de65c5d90d0e48a43fd30b7a068 SHA512 017d1f4b86beb557f5a12d588b0ae94adcffa19e82c8021bcc8f5c820c6e42f339a6eea2e3481a1ff290274dc5fe268f7c715954879b35eec2f70e1247534288 WHIRLPOOL 29270c86ef5ce93cbffc3211158ace950e00327b4c44123bbd68affea7edaa4aea65e94c7f42f519d0c40a6194e9a97d5daebe80690d5601df0486e95e9fb0d9
-MISC metadata.xml 261 SHA256 79e4408c376b1533805b02d5ba420f98d4b0c5bdbb63f79fd8de60805a06cf4d SHA512 0d5882a37b5b0602d2b96fb491b24855e90effa1817a40779707b83af8886cc68660b907872dcf78bbbb0215ae940ff442e1b9dfce3ae3fed37eb6ae230549b9 WHIRLPOOL a2946c161bcc5b1b1af790a5f93ea977126da3269f792586b7dde0ac9d645f3c8ad41b52c51f613916f532e772c0b510f7296b016a8e739d5288937f75a56d3b
+EBUILD libcxxrt-9999.ebuild 1863 SHA256 3db4dcd1bffcb0906dfa5aa1e19744b2070a77b028787aa60d7fbac9e02c9dee SHA512 39982a9c9837618dd475c5d3c2b797f52e331faa3bab361a520360728e85514cf650a4070402df84ebfe8ada22edff6a9541b2cad3d1280b68d411e969b4493a WHIRLPOOL 17e26b6aebc796f6f1cee91f02dc999f53067e684182ce2b229857e28b0b171a4575f0da0b68155953bf392e0db7f92009448f9e72c296027d8811c21308e6e0
+MISC ChangeLog 2649 SHA256 1589805974652500cff26d2cde6cdbf27951f3c5ff542ec648a3c7312dc81c27 SHA512 53e20c202266221759924727c6cb3784b849196eb905d574966c75a0a52026d3d5a4d819ef2c98df616c627fbd83c945de06621020f08320692064f7b45eae42 WHIRLPOOL 22965d16caf674b12ee3b402a4cf6730238c249cdbfb4f8803cc208636db287b8f6f31d52cb57e45d4720443052b0a82b75601c9c6484b286d16c893d71abbe6
+MISC metadata.xml 487 SHA256 8555868cad0dd1e415efdfc947d5ad9ccfea5e68d64d8467487480c15bb594ed SHA512 a377efd893dd484c6d99509d0f5c72a81e0ca3f10078e73110cae45acf8142921265d53f540db854ce1d72b558b380dd645b8f7802aac72f9f761ad0d2767e24 WHIRLPOOL d30b16450bbbe1d7fd4120ebe04e461b89d3575e0ac4a3b1e0956c64172a1bcf0bf6637f58f899f4d6c6ad557bffdccec7c9993202ddf79425f5634882c9891f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGox8IACgkQvFcC4BYPU0oGBwCggk8sNB6cVkGJpbRY1TKKiANY
-5UoAoLsZdLl3NH17v3tFNFs1DTRfz9bH
-=F+dw
+iEYEAREIAAYFAlGp8AIACgkQvFcC4BYPU0o2lwCgs1Osew8zj3twm5OJw1XUDLf7
+rCoAnieLAPFwk92rt5lOsjXloRkcmIAb
+=TRXq
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
index c605dce95434..2a42a0d280b2 100644
--- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.6 2013/05/30 23:33:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.7 2013/06/01 12:58:41 aballier Exp $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://github.com/pathscale/libcxxrt.git"
 
@@ -26,9 +26,9 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE="static-libs"
+IUSE="libunwind static-libs"
 
-RDEPEND=">=sys-libs/libunwind-1.0.1-r1[static-libs?]"
+RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )"
 DEPEND="${RDEPEND}
 	${DEPEND}"
 
@@ -40,12 +40,11 @@ src_prepare() {
 
 src_compile() {
 	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
-	# libcxxrt needs: dladdr (dlopen_lib), libunwind (or libgcc_s but we build
-	# over libunwind) and the libc.
+	# libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc.
 	tc-export CC CXX AR
 	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
 	cd "${S}/src"
-	LIBS="$(dlopen_lib) -lunwind -lc" emake shared
+	LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared
 	use static-libs && emake static
 }
 
diff --git a/sys-libs/libcxxrt/metadata.xml b/sys-libs/libcxxrt/metadata.xml
index 503e8a53624d..38e83d0c31d0 100644
--- a/sys-libs/libcxxrt/metadata.xml
+++ b/sys-libs/libcxxrt/metadata.xml
@@ -6,5 +6,8 @@
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</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>
+  </use>
 </pkgmetadata>