| 1 |
aballier 13/06/01 12:58:41 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog libcxxrt-9999.ebuild |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sys-libs/libcxxrt/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/metadata.xml?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/metadata.xml?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/metadata.xml?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/metadata.xml,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- metadata.xml 28 May 2012 13:58:04 -0000 1.1 |
| 23 |
+++ metadata.xml 1 Jun 2013 12:58:41 -0000 1.2 |
| 24 |
@@ -6,5 +6,8 @@ |
| 25 |
<email>aballier@g.o</email> |
| 26 |
<name>Alexis Ballier</name> |
| 27 |
</maintainer> |
| 28 |
+ <use> |
| 29 |
+ <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> |
| 30 |
+ </use> |
| 31 |
</pkgmetadata> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.12 sys-libs/libcxxrt/ChangeLog |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/ChangeLog?rev=1.12&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/ChangeLog?rev=1.12&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/ChangeLog?r1=1.11&r2=1.12 |
| 41 |
|
| 42 |
Index: ChangeLog |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v |
| 45 |
retrieving revision 1.11 |
| 46 |
retrieving revision 1.12 |
| 47 |
diff -u -r1.11 -r1.12 |
| 48 |
--- ChangeLog 31 May 2013 15:54:40 -0000 1.11 |
| 49 |
+++ ChangeLog 1 Jun 2013 12:58:41 -0000 1.12 |
| 50 |
@@ -1,6 +1,11 @@ |
| 51 |
# ChangeLog for sys-libs/libcxxrt |
| 52 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.11 2013/05/31 15:54:40 aballier Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.12 2013/06/01 12:58:41 aballier Exp $ |
| 55 |
+ |
| 56 |
+ 01 Jun 2013; Alexis Ballier <aballier@g.o> libcxxrt-9999.ebuild, |
| 57 |
+ metadata.xml: |
| 58 |
+ Make libunwind usage optional: clang is setup to use libgcc_s so there is no |
| 59 |
+ serious point for now in trying to avoid using libgcc_s. |
| 60 |
|
| 61 |
*libcxxrt-0.0_p20130531 (31 May 2013) |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.7 sys-libs/libcxxrt/libcxxrt-9999.ebuild |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild?rev=1.7&view=markup |
| 69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild?rev=1.7&content-type=text/plain |
| 70 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild?r1=1.6&r2=1.7 |
| 71 |
|
| 72 |
Index: libcxxrt-9999.ebuild |
| 73 |
=================================================================== |
| 74 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v |
| 75 |
retrieving revision 1.6 |
| 76 |
retrieving revision 1.7 |
| 77 |
diff -u -r1.6 -r1.7 |
| 78 |
--- libcxxrt-9999.ebuild 30 May 2013 23:33:32 -0000 1.6 |
| 79 |
+++ libcxxrt-9999.ebuild 1 Jun 2013 12:58:41 -0000 1.7 |
| 80 |
@@ -1,8 +1,8 @@ |
| 81 |
# Copyright 1999-2013 Gentoo Foundation |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.6 2013/05/30 23:33:32 aballier Exp $ |
| 84 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.7 2013/06/01 12:58:41 aballier Exp $ |
| 85 |
|
| 86 |
-EAPI=4 |
| 87 |
+EAPI=5 |
| 88 |
|
| 89 |
EGIT_REPO_URI="git://github.com/pathscale/libcxxrt.git" |
| 90 |
|
| 91 |
@@ -26,9 +26,9 @@ |
| 92 |
else |
| 93 |
KEYWORDS="" |
| 94 |
fi |
| 95 |
-IUSE="static-libs" |
| 96 |
+IUSE="libunwind static-libs" |
| 97 |
|
| 98 |
-RDEPEND=">=sys-libs/libunwind-1.0.1-r1[static-libs?]" |
| 99 |
+RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )" |
| 100 |
DEPEND="${RDEPEND} |
| 101 |
${DEPEND}" |
| 102 |
|
| 103 |
@@ -40,12 +40,11 @@ |
| 104 |
|
| 105 |
src_compile() { |
| 106 |
# Notes: we build -nodefaultlibs to avoid linking to gcc libs. |
| 107 |
- # libcxxrt needs: dladdr (dlopen_lib), libunwind (or libgcc_s but we build |
| 108 |
- # over libunwind) and the libc. |
| 109 |
+ # libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc. |
| 110 |
tc-export CC CXX AR |
| 111 |
append-ldflags "-Wl,-z,defs" # make sure we are not underlinked |
| 112 |
cd "${S}/src" |
| 113 |
- LIBS="$(dlopen_lib) -lunwind -lc" emake shared |
| 114 |
+ LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared |
| 115 |
use static-libs && emake static |
| 116 |
} |
Archives