Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
Date: Thu, 30 May 2013 23:36:41
Message-Id: 20130530233635.E30B72171D@flycatcher.gentoo.org
1 aballier 13/05/30 23:36:35
2
3 Modified: ChangeLog libcxx-9999.ebuild
4 Log:
5 use upstream documented way for building on top of libcxxrt
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.15 sys-libs/libcxx/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.15&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.15&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.14&r2=1.15
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
19 retrieving revision 1.14
20 retrieving revision 1.15
21 diff -u -r1.14 -r1.15
22 --- ChangeLog 30 May 2013 23:21:43 -0000 1.14
23 +++ ChangeLog 30 May 2013 23:36:35 -0000 1.15
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.14 2013/05/30 23:21:43 aballier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.15 2013/05/30 23:36:35 aballier Exp $
29 +
30 + 30 May 2013; Alexis Ballier <aballier@g.o> libcxx-9999.ebuild:
31 + use upstream documented way for building on top of libcxxrt
32
33 30 May 2013; Alexis Ballier <aballier@g.o> libcxx-9999.ebuild:
34 add a static-libs useflag and link tests with -lm
35
36
37
38 1.8 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.8&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.8&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.7&r2=1.8
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.7
48 retrieving revision 1.8
49 diff -u -r1.7 -r1.8
50 --- libcxx-9999.ebuild 30 May 2013 23:21:43 -0000 1.7
51 +++ libcxx-9999.ebuild 30 May 2013 23:36:35 -0000 1.8
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.7 2013/05/30 23:21:43 aballier Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.8 2013/05/30 23:36:35 aballier Exp $
57
58 EAPI=5
59
60 @@ -27,7 +27,7 @@
61 fi
62 IUSE="static-libs"
63
64 -RDEPEND="sys-libs/libcxxrt[static-libs?]"
65 +RDEPEND=">=sys-libs/libcxxrt-0.0_p20130530[static-libs?]"
66 DEPEND="${RDEPEND}
67 sys-devel/clang
68 app-arch/xz-utils"
69 @@ -41,12 +41,20 @@
70 }
71
72 src_configure() {
73 - append-cppflags "-I/usr/include/libcxxrt -DLIBCXXRT"
74 # Needs to be built with clang. gcc-4.6.3 fails at least.
75 # TODO: cross-compile ?
76 export CC=clang
77 export CXX=clang++
78 - use static-libs && BUILD_DIR="${S}_static" mycmakeargs="-DLIBCXX_ENABLE_SHARED=OFF" cmake-utils_src_configure
79 +
80 + local mycmakeargs_base=(
81 + -DLIBCXX_CXX_ABI=libcxxrt
82 + -DLIBCXX_LIBCXXRT_INCLUDE_PATHS="/usr/include/libcxxrt/"
83 + )
84 + if use static-libs ; then
85 + local mycmakeargs=( "${mycmakeargs_base[@]}" "-DLIBCXX_ENABLE_SHARED=OFF" )
86 + BUILD_DIR="${S}_static" cmake-utils_src_configure
87 + fi
88 + local mycmakeargs=( "${mycmakeargs_base[@]}" )
89 BUILD_DIR="${S}_shared" cmake-utils_src_configure
90 }