| 1 |
aballier 13/05/30 23:21:43 |
| 2 |
|
| 3 |
Modified: ChangeLog libcxx-9999.ebuild |
| 4 |
Log: |
| 5 |
add a static-libs useflag and link tests with -lm |
| 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.14 sys-libs/libcxx/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.14&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.14&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.13&r2=1.14 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v |
| 19 |
retrieving revision 1.13 |
| 20 |
retrieving revision 1.14 |
| 21 |
diff -u -r1.13 -r1.14 |
| 22 |
--- ChangeLog 30 May 2013 21:51:41 -0000 1.13 |
| 23 |
+++ ChangeLog 30 May 2013 23:21:43 -0000 1.14 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for sys-libs/libcxx |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.13 2013/05/30 21:51:41 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.14 2013/05/30 23:21:43 aballier Exp $ |
| 29 |
+ |
| 30 |
+ 30 May 2013; Alexis Ballier <aballier@g.o> libcxx-9999.ebuild: |
| 31 |
+ add a static-libs useflag and link tests with -lm |
| 32 |
|
| 33 |
30 May 2013; Alexis Ballier <aballier@g.o> |
| 34 |
-libcxx-0.0_p20121105.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.7 sys-libs/libcxx/libcxx-9999.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.7&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.7&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.6&r2=1.7 |
| 43 |
|
| 44 |
Index: libcxx-9999.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v |
| 47 |
retrieving revision 1.6 |
| 48 |
retrieving revision 1.7 |
| 49 |
diff -u -r1.6 -r1.7 |
| 50 |
--- libcxx-9999.ebuild 30 May 2013 21:48:05 -0000 1.6 |
| 51 |
+++ libcxx-9999.ebuild 30 May 2013 23:21:43 -0000 1.7 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.6 2013/05/30 21:48:05 aballier Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.7 2013/05/30 23:21:43 aballier Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
|
| 60 |
@@ -25,9 +25,9 @@ |
| 61 |
else |
| 62 |
KEYWORDS="" |
| 63 |
fi |
| 64 |
-IUSE="" |
| 65 |
+IUSE="static-libs" |
| 66 |
|
| 67 |
-RDEPEND="sys-libs/libcxxrt" |
| 68 |
+RDEPEND="sys-libs/libcxxrt[static-libs?]" |
| 69 |
DEPEND="${RDEPEND} |
| 70 |
sys-devel/clang |
| 71 |
app-arch/xz-utils" |
| 72 |
@@ -46,19 +46,31 @@ |
| 73 |
# TODO: cross-compile ? |
| 74 |
export CC=clang |
| 75 |
export CXX=clang++ |
| 76 |
- cmake-utils_src_configure |
| 77 |
+ use static-libs && BUILD_DIR="${S}_static" mycmakeargs="-DLIBCXX_ENABLE_SHARED=OFF" cmake-utils_src_configure |
| 78 |
+ BUILD_DIR="${S}_shared" cmake-utils_src_configure |
| 79 |
+} |
| 80 |
+ |
| 81 |
+src_compile() { |
| 82 |
+ use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_compile |
| 83 |
+ BUILD_DIR="${S}_shared" cmake-utils_src_compile |
| 84 |
} |
| 85 |
|
| 86 |
# Tests fail for now, if anybody is able to fix them, help is very welcome. |
| 87 |
src_test() { |
| 88 |
cd "${S}/test" |
| 89 |
- LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \ |
| 90 |
+ LD_LIBRARY_PATH="${S}_shared/lib:${LD_LIBRARY_PATH}" \ |
| 91 |
CC="clang++" \ |
| 92 |
HEADER_INCLUDE="-I${S}/include" \ |
| 93 |
- SOURCE_LIB="-L${CMAKE_BUILD_DIR}/lib" \ |
| 94 |
+ SOURCE_LIB="-L${S}_shared/lib" \ |
| 95 |
+ LIBS="-lm" \ |
| 96 |
./testit || die |
| 97 |
} |
| 98 |
|
| 99 |
+src_install() { |
| 100 |
+ use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_install |
| 101 |
+ BUILD_DIR="${S}_shared" cmake-utils_src_install |
| 102 |
+} |
| 103 |
+ |
| 104 |
pkg_postinst() { |
| 105 |
elog "This package (${PN}) is mainly intended as a replacement for the C++" |
| 106 |
elog "standard library when using clang." |
Archives