| 1 |
aballier 13/06/01 14:15:35 |
| 2 |
|
| 3 |
Modified: libcxxrt-0.0_p20130531.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Make libunwind optional in the current snapshot too |
| 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/libcxxrt-0.0_p20130531.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: libcxxrt-0.0_p20130531.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- libcxxrt-0.0_p20130531.ebuild 31 May 2013 15:54:41 -0000 1.1 |
| 23 |
+++ libcxxrt-0.0_p20130531.ebuild 1 Jun 2013 14:15:35 -0000 1.2 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild,v 1.1 2013/05/31 15:54:41 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild,v 1.2 2013/06/01 14:15:35 aballier Exp $ |
| 29 |
|
| 30 |
-EAPI=4 |
| 31 |
+EAPI=5 |
| 32 |
|
| 33 |
EGIT_REPO_URI="git://github.com/pathscale/libcxxrt.git" |
| 34 |
|
| 35 |
@@ -26,9 +26,9 @@ |
| 36 |
else |
| 37 |
KEYWORDS="" |
| 38 |
fi |
| 39 |
-IUSE="static-libs" |
| 40 |
+IUSE="libunwind static-libs" |
| 41 |
|
| 42 |
-RDEPEND=">=sys-libs/libunwind-1.0.1-r1[static-libs?]" |
| 43 |
+RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )" |
| 44 |
DEPEND="${RDEPEND} |
| 45 |
${DEPEND}" |
| 46 |
|
| 47 |
@@ -40,12 +40,11 @@ |
| 48 |
|
| 49 |
src_compile() { |
| 50 |
# Notes: we build -nodefaultlibs to avoid linking to gcc libs. |
| 51 |
- # libcxxrt needs: dladdr (dlopen_lib), libunwind (or libgcc_s but we build |
| 52 |
- # over libunwind) and the libc. |
| 53 |
+ # libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc. |
| 54 |
tc-export CC CXX AR |
| 55 |
append-ldflags "-Wl,-z,defs" # make sure we are not underlinked |
| 56 |
cd "${S}/src" |
| 57 |
- LIBS="$(dlopen_lib) -lunwind -lc" emake shared |
| 58 |
+ LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared |
| 59 |
use static-libs && emake static |
| 60 |
} |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.13 sys-libs/libcxxrt/ChangeLog |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/ChangeLog?rev=1.13&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/ChangeLog?rev=1.13&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/ChangeLog?r1=1.12&r2=1.13 |
| 70 |
|
| 71 |
Index: ChangeLog |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v |
| 74 |
retrieving revision 1.12 |
| 75 |
retrieving revision 1.13 |
| 76 |
diff -u -r1.12 -r1.13 |
| 77 |
--- ChangeLog 1 Jun 2013 12:58:41 -0000 1.12 |
| 78 |
+++ ChangeLog 1 Jun 2013 14:15:35 -0000 1.13 |
| 79 |
@@ -1,6 +1,10 @@ |
| 80 |
# ChangeLog for sys-libs/libcxxrt |
| 81 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.12 2013/06/01 12:58:41 aballier Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.13 2013/06/01 14:15:35 aballier Exp $ |
| 84 |
+ |
| 85 |
+ 01 Jun 2013; Alexis Ballier <aballier@g.o> |
| 86 |
+ libcxxrt-0.0_p20130531.ebuild: |
| 87 |
+ Make libunwind optional in the current snapshot too |
| 88 |
|
| 89 |
01 Jun 2013; Alexis Ballier <aballier@g.o> libcxxrt-9999.ebuild, |
| 90 |
metadata.xml: |
Archives