* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2012-05-28 13:59 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-28 13:59 UTC (permalink / raw
To: gentoo-commits
aballier 12/05/28 13:59:52
Modified: ChangeLog libcxx-9999.ebuild
Log:
build it on top of libcxxrt as done in FreeBSD
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.1&r2=1.2
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 24 May 2012 03:01:42 -0000 1.1
+++ ChangeLog 28 May 2012 13:59:52 -0000 1.2
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.1 2012/05/24 03:01:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.2 2012/05/28 13:59:52 aballier Exp $
+
+ 28 May 2012; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild,
+ +files/cxxrt.patch:
+ build it on top of libcxxrt as done in FreeBSD
*libcxx-9999 (24 May 2012)
*libcxx-0.0_p20120523 (24 May 2012)
1.2 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.1&r2=1.2
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libcxx-9999.ebuild 24 May 2012 03:01:42 -0000 1.1
+++ libcxx-9999.ebuild 28 May 2012 13:59:52 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.1 2012/05/24 03:01:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.2 2012/05/28 13:59:52 aballier Exp $
EAPI=4
@@ -8,7 +8,7 @@
[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-inherit cmake-utils ${SCM} base
+inherit cmake-utils ${SCM} base flag-o-matic
DESCRIPTION="New implementation of the C++ standard library, targeting C++0X"
HOMEPAGE="http://libcxx.llvm.org/"
@@ -27,12 +27,13 @@
fi
IUSE=""
-RDEPEND=""
+RDEPEND="sys-libs/libcxxrt"
DEPEND="${RDEPEND}
sys-devel/clang
app-arch/xz-utils"
-PATCHES=( "${FILESDIR}/multilib.patch" )
+PATCHES=( "${FILESDIR}/multilib.patch"
+ "${FILESDIR}/cxxrt.patch" )
DOCS=( "CREDITS.TXT" )
src_prepare() {
@@ -40,6 +41,7 @@
}
src_configure() {
+ append-cppflags "-I/usr/include/libcxxrt -DLIBCXXRT"
# Needs to be built with clang. gcc-4.6.3 fails at least.
# TODO: cross-compile ?
export CC=clang
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-05-30 21:48 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-05-30 21:48 UTC (permalink / raw
To: gentoo-commits
aballier 13/05/30 21:48:05
Modified: ChangeLog libcxx-9999.ebuild
Log:
bump to eapi5
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.12 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.11&r2=1.12
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog 18 Feb 2013 14:30:06 -0000 1.11
+++ ChangeLog 30 May 2013 21:48:05 -0000 1.12
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.11 2013/02/18 14:30:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.12 2013/05/30 21:48:05 aballier Exp $
+
+ 30 May 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ bump to eapi5
*libcxx-0.0_p20130218 (18 Feb 2013)
1.6 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.5&r2=1.6
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcxx-9999.ebuild 31 Jan 2013 17:56:57 -0000 1.5
+++ libcxx-9999.ebuild 30 May 2013 21:48:05 -0000 1.6
@@ -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/libcxx/libcxx-9999.ebuild,v 1.5 2013/01/31 17:56:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.6 2013/05/30 21:48:05 aballier Exp $
-EAPI=4
+EAPI=5
ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-05-30 23:21 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-05-30 23:21 UTC (permalink / raw
To: gentoo-commits
aballier 13/05/30 23:21:43
Modified: ChangeLog libcxx-9999.ebuild
Log:
add a static-libs useflag and link tests with -lm
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.14 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.13&r2=1.14
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog 30 May 2013 21:51:41 -0000 1.13
+++ ChangeLog 30 May 2013 23:21:43 -0000 1.14
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.13 2013/05/30 21:51:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.14 2013/05/30 23:21:43 aballier Exp $
+
+ 30 May 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ add a static-libs useflag and link tests with -lm
30 May 2013; Alexis Ballier <aballier@gentoo.org>
-libcxx-0.0_p20121105.ebuild:
1.7 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.6&r2=1.7
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libcxx-9999.ebuild 30 May 2013 21:48:05 -0000 1.6
+++ libcxx-9999.ebuild 30 May 2013 23:21:43 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.6 2013/05/30 21:48:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.7 2013/05/30 23:21:43 aballier Exp $
EAPI=5
@@ -25,9 +25,9 @@
else
KEYWORDS=""
fi
-IUSE=""
+IUSE="static-libs"
-RDEPEND="sys-libs/libcxxrt"
+RDEPEND="sys-libs/libcxxrt[static-libs?]"
DEPEND="${RDEPEND}
sys-devel/clang
app-arch/xz-utils"
@@ -46,19 +46,31 @@
# TODO: cross-compile ?
export CC=clang
export CXX=clang++
- cmake-utils_src_configure
+ use static-libs && BUILD_DIR="${S}_static" mycmakeargs="-DLIBCXX_ENABLE_SHARED=OFF" cmake-utils_src_configure
+ BUILD_DIR="${S}_shared" cmake-utils_src_configure
+}
+
+src_compile() {
+ use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_compile
+ BUILD_DIR="${S}_shared" cmake-utils_src_compile
}
# Tests fail for now, if anybody is able to fix them, help is very welcome.
src_test() {
cd "${S}/test"
- LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+ LD_LIBRARY_PATH="${S}_shared/lib:${LD_LIBRARY_PATH}" \
CC="clang++" \
HEADER_INCLUDE="-I${S}/include" \
- SOURCE_LIB="-L${CMAKE_BUILD_DIR}/lib" \
+ SOURCE_LIB="-L${S}_shared/lib" \
+ LIBS="-lm" \
./testit || die
}
+src_install() {
+ use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_install
+ BUILD_DIR="${S}_shared" cmake-utils_src_install
+}
+
pkg_postinst() {
elog "This package (${PN}) is mainly intended as a replacement for the C++"
elog "standard library when using clang."
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-05-30 23:36 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-05-30 23:36 UTC (permalink / raw
To: gentoo-commits
aballier 13/05/30 23:36:35
Modified: ChangeLog libcxx-9999.ebuild
Log:
use upstream documented way for building on top of libcxxrt
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.15 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 30 May 2013 23:21:43 -0000 1.14
+++ ChangeLog 30 May 2013 23:36:35 -0000 1.15
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.14 2013/05/30 23:21:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.15 2013/05/30 23:36:35 aballier Exp $
+
+ 30 May 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ use upstream documented way for building on top of libcxxrt
30 May 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
add a static-libs useflag and link tests with -lm
1.8 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.7&r2=1.8
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libcxx-9999.ebuild 30 May 2013 23:21:43 -0000 1.7
+++ libcxx-9999.ebuild 30 May 2013 23:36:35 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.7 2013/05/30 23:21:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.8 2013/05/30 23:36:35 aballier Exp $
EAPI=5
@@ -27,7 +27,7 @@
fi
IUSE="static-libs"
-RDEPEND="sys-libs/libcxxrt[static-libs?]"
+RDEPEND=">=sys-libs/libcxxrt-0.0_p20130530[static-libs?]"
DEPEND="${RDEPEND}
sys-devel/clang
app-arch/xz-utils"
@@ -41,12 +41,20 @@
}
src_configure() {
- append-cppflags "-I/usr/include/libcxxrt -DLIBCXXRT"
# Needs to be built with clang. gcc-4.6.3 fails at least.
# TODO: cross-compile ?
export CC=clang
export CXX=clang++
- use static-libs && BUILD_DIR="${S}_static" mycmakeargs="-DLIBCXX_ENABLE_SHARED=OFF" cmake-utils_src_configure
+
+ local mycmakeargs_base=(
+ -DLIBCXX_CXX_ABI=libcxxrt
+ -DLIBCXX_LIBCXXRT_INCLUDE_PATHS="/usr/include/libcxxrt/"
+ )
+ if use static-libs ; then
+ local mycmakeargs=( "${mycmakeargs_base[@]}" "-DLIBCXX_ENABLE_SHARED=OFF" )
+ BUILD_DIR="${S}_static" cmake-utils_src_configure
+ fi
+ local mycmakeargs=( "${mycmakeargs_base[@]}" )
BUILD_DIR="${S}_shared" cmake-utils_src_configure
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-07-03 18:38 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-03 18:38 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/03 18:38:26
Modified: ChangeLog libcxx-9999.ebuild
Log:
inherit base before subversion to get a correct src_unpack, bug #475598 by Michael Weber
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.22 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.21&r2=1.22
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 2 Jul 2013 21:56:24 -0000 1.21
+++ ChangeLog 3 Jul 2013 18:38:26 -0000 1.22
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.21 2013/07/02 21:56:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.22 2013/07/03 18:38:26 aballier Exp $
+
+ 03 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ inherit base before subversion to get a correct src_unpack, bug #475598 by
+ Michael Weber
02 Jul 2013; Alexis Ballier <aballier@gentoo.org>
libcxx-0.0_p20130531-r1.ebuild, libcxx-9999.ebuild:
1.14 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.13&r2=1.14
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libcxx-9999.ebuild 2 Jul 2013 21:56:24 -0000 1.13
+++ libcxx-9999.ebuild 3 Jul 2013 18:38:26 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.13 2013/07/02 21:56:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.14 2013/07/03 18:38:26 aballier Exp $
EAPI=5
@@ -8,7 +8,7 @@
[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-inherit cmake-utils ${SCM} base flag-o-matic toolchain-funcs multilib
+inherit cmake-utils base ${SCM} flag-o-matic toolchain-funcs multilib
DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
HOMEPAGE="http://libcxx.llvm.org/"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-07-03 21:17 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-03 21:17 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/03 21:17:16
Modified: ChangeLog libcxx-9999.ebuild
Log:
Use a simple Makefile instead of cmake for building it and drop our patches. It no longer needs to be built with clang.
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.23 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.22&r2=1.23
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog 3 Jul 2013 18:38:26 -0000 1.22
+++ ChangeLog 3 Jul 2013 21:17:16 -0000 1.23
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.22 2013/07/03 18:38:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.23 2013/07/03 21:17:16 aballier Exp $
+
+ 03 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild,
+ +files/Makefile:
+ Use a simple Makefile instead of cmake for building it and drop our patches.
+ It no longer needs to be built with clang.
03 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
inherit base before subversion to get a correct src_unpack, bug #475598 by
1.15 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.14&r2=1.15
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libcxx-9999.ebuild 3 Jul 2013 18:38:26 -0000 1.14
+++ libcxx-9999.ebuild 3 Jul 2013 21:17:16 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.14 2013/07/03 18:38:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.15 2013/07/03 21:17:16 aballier Exp $
EAPI=5
@@ -8,7 +8,7 @@
[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-inherit cmake-utils base ${SCM} flag-o-matic toolchain-funcs multilib
+inherit ${SCM} flag-o-matic toolchain-funcs multilib
DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
HOMEPAGE="http://libcxx.llvm.org/"
@@ -25,64 +25,47 @@
else
KEYWORDS=""
fi
-IUSE="elibc_glibc +libcxxrt static-libs"
+IUSE="elibc_glibc +libcxxrt static-libs test"
RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?] )
!libcxxrt? ( sys-devel/gcc[cxx] )"
DEPEND="${RDEPEND}
- sys-devel/clang
+ test? ( sys-devel/clang )
app-arch/xz-utils"
-PATCHES=( "${FILESDIR}/multilib.patch" )
-DOCS=( "CREDITS.TXT" )
-
src_prepare() {
- use libcxxrt && PATCHES+=( "${FILESDIR}/cxxrt.patch" )
- base_src_prepare
+ cp -f "${FILESDIR}/Makefile" lib/ || die
}
-src_configure() {
- local mycmakeargs_base=( )
+src_compile() {
+ export LIBS="-lpthread -lrt -lc -lgcc_s"
if use libcxxrt ; then
- mycmakeargs_base=(
- -DLIBCXX_CXX_ABI=libcxxrt
- -DLIBCXX_LIBCXXRT_INCLUDE_PATHS="/usr/include/libcxxrt/"
- )
+ append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
+ LIBS="-lcxxrt ${LIBS}"
else
# Very hackish, see $HOMEPAGE
# If someone has a clever idea, please share it!
- local includes="$(echo | "$(tc-getCXX)" -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ';' | tr -d ' ')"
- mycmakeargs_base=(
- -DLIBCXX_CXX_ABI=libsupc++
- -DLIBCXX_LIBSUPCXX_INCLUDE_PATHS="${includes}"
- )
+ local includes="$(echo | "$(tc-getCXX)" -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
+ append-cppflags -D__GLIBCXX__ ${includes}
+ LIBS="-lsupc++ ${LIBS}"
fi
- # Needs to be built with clang. gcc-4.6.3 fails at least.
- # TODO: cross-compile ?
- export CC="clang"
- export CXX="clang++"
+ tc-export AR CC CXX
- if use static-libs ; then
- local mycmakeargs=( "${mycmakeargs_base[@]}" "-DLIBCXX_ENABLE_SHARED=OFF" )
- BUILD_DIR="${S}_static" cmake-utils_src_configure
- fi
- local mycmakeargs=( "${mycmakeargs_base[@]}" )
- BUILD_DIR="${S}_shared" cmake-utils_src_configure
-}
+ append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-src_compile() {
- use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_compile
- BUILD_DIR="${S}_shared" cmake-utils_src_compile
+ cd "${S}/lib" || die
+ emake shared
+ use static-libs && emake static
}
# Tests fail for now, if anybody is able to fix them, help is very welcome.
src_test() {
cd "${S}/test"
- LD_LIBRARY_PATH="${S}_shared/lib:${LD_LIBRARY_PATH}" \
+ LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
CC="clang++" \
HEADER_INCLUDE="-I${S}/include" \
- SOURCE_LIB="-L${S}_shared/lib" \
+ SOURCE_LIB="-L${S}/lib" \
LIBS="-lm" \
./testit || die
}
@@ -117,11 +100,18 @@
}
src_install() {
+ cd "${S}/lib"
if use static-libs ; then
- BUILD_DIR="${S}_static" cmake-utils_src_install
+ dolib.a libc++.a
gen_static_ldscript
fi
- BUILD_DIR="${S}_shared" cmake-utils_src_install
+ dolib.so libc++.so*
+
+ cd "${S}"
+ insinto /usr/include/c++/v1
+ doins -r include/*
+
+ dodoc CREDITS.TXT
}
pkg_postinst() {
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-07-03 21:52 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-03 21:52 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/03 21:52:45
Modified: ChangeLog libcxx-9999.ebuild
Log:
Go multilib, based on the work of Yuta SATOH in bug #475294
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.24 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.23&r2=1.24
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog 3 Jul 2013 21:17:16 -0000 1.23
+++ ChangeLog 3 Jul 2013 21:52:45 -0000 1.24
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.23 2013/07/03 21:17:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.24 2013/07/03 21:52:45 aballier Exp $
+
+ 03 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ Go multilib, based on the work of Yuta SATOH in bug #475294
03 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild,
+files/Makefile:
1.16 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.15&r2=1.16
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libcxx-9999.ebuild 3 Jul 2013 21:17:16 -0000 1.15
+++ libcxx-9999.ebuild 3 Jul 2013 21:52:45 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.15 2013/07/03 21:17:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.16 2013/07/03 21:52:45 aballier Exp $
EAPI=5
@@ -8,7 +8,7 @@
[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-inherit ${SCM} flag-o-matic toolchain-funcs multilib
+inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal
DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
HOMEPAGE="http://libcxx.llvm.org/"
@@ -27,17 +27,20 @@
fi
IUSE="elibc_glibc +libcxxrt static-libs test"
-RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?] )
+RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?,${MULTILIB_USEDEP}] )
!libcxxrt? ( sys-devel/gcc[cxx] )"
DEPEND="${RDEPEND}
test? ( sys-devel/clang )
app-arch/xz-utils"
+DOCS=( CREDITS.TXT )
+
src_prepare() {
cp -f "${FILESDIR}/Makefile" lib/ || die
+ multilib_copy_sources
}
-src_compile() {
+src_configure() {
export LIBS="-lpthread -lrt -lc -lgcc_s"
if use libcxxrt ; then
append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
@@ -53,19 +56,22 @@
tc-export AR CC CXX
append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
+}
- cd "${S}/lib" || die
+multilib_src_compile() {
+ cd "${BUILD_DIR}/lib" || die
emake shared
use static-libs && emake static
}
# Tests fail for now, if anybody is able to fix them, help is very welcome.
-src_test() {
- cd "${S}/test"
- LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
- CC="clang++" \
- HEADER_INCLUDE="-I${S}/include" \
- SOURCE_LIB="-L${S}/lib" \
+multilib_src_test() {
+ cd "${BUILD_DIR}/test"
+ LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+ LD_32_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_32_LIBRARY_PATH}" \
+ CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
+ HEADER_INCLUDE="-I${BUILD_DIR}/include" \
+ SOURCE_LIB="-L${BUILD_DIR}/lib" \
LIBS="-lm" \
./testit || die
}
@@ -99,19 +105,18 @@
# TODO: Generate a libc++.a ldscript when building against libsupc++
}
-src_install() {
- cd "${S}/lib"
+multilib_src_install() {
+ cd "${BUILD_DIR}/lib"
if use static-libs ; then
dolib.a libc++.a
gen_static_ldscript
fi
dolib.so libc++.so*
+}
- cd "${S}"
+multilib_src_install_all() {
insinto /usr/include/c++/v1
doins -r include/*
-
- dodoc CREDITS.TXT
}
pkg_postinst() {
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-07-24 1:00 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-24 1:00 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/24 01:00:45
Modified: ChangeLog libcxx-9999.ebuild
Log:
provide a shared ldscript for linking in libcxxrt too as its abi is more or less exposed by libcxx headers, bug #477712
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.25 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.24&r2=1.25
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog 3 Jul 2013 21:52:45 -0000 1.24
+++ ChangeLog 24 Jul 2013 01:00:45 -0000 1.25
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.24 2013/07/03 21:52:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.25 2013/07/24 01:00:45 aballier Exp $
+
+ 24 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ provide a shared ldscript for linking in libcxxrt too as its abi is more or
+ less exposed by libcxx headers, bug #477712
03 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
Go multilib, based on the work of Yuta SATOH in bug #475294
1.17 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.16&r2=1.17
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libcxx-9999.ebuild 3 Jul 2013 21:52:45 -0000 1.16
+++ libcxx-9999.ebuild 24 Jul 2013 01:00:45 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.16 2013/07/03 21:52:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.17 2013/07/24 01:00:45 aballier Exp $
EAPI=5
@@ -76,35 +76,47 @@
./testit || die
}
+# Usage: deps
+gen_ldscript() {
+ local output_format
+ output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+ [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+ cat <<-END_LDSCRIPT
+/* GNU ld script
+ Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
gen_static_ldscript() {
if use libcxxrt ; then
# Move it first.
- mv "${D}/${EPREFIX}/usr/$(get_libdir)/libc++.a" "${D}/${EPREFIX}/usr/$(get_libdir)/libc++_static.a" || die
+ mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
# Generate libc++.a ldscript for inclusion of its dependencies so that
# clang++ -stdlib=libc++ -static works out of the box.
- # Taken from toolchain-funcs.eclass:
- local output_format
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
# On Linux/glibc it does not link without libpthread or libdl. It is
# fine on FreeBSD.
use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
- cat > "${D}/${EPREFIX}/usr/$(get_libdir)/libc++.a" <<-END_LDSCRIPT
-/* GNU ld script
- Include libc++.a dependencies for 'clang++ -stdlib=libc++ -static' to work
- out of the box.
- */
-${output_format}
-GROUP ( ${deps} )
-END_LDSCRIPT
+ gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
fi
# TODO: Generate a libc++.a ldscript when building against libsupc++
}
+gen_shared_ldscript() {
+ if use libcxxrt ; then
+ mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
+ local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
+ gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
+ fi
+ # TODO: Generate the linked script for other confiurations too.
+}
+
multilib_src_install() {
cd "${BUILD_DIR}/lib"
if use static-libs ; then
@@ -112,6 +124,7 @@
gen_static_ldscript
fi
dolib.so libc++.so*
+ gen_shared_ldscript
}
multilib_src_install_all() {
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-07-24 1:41 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-24 1:41 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/24 01:41:52
Modified: ChangeLog libcxx-9999.ebuild
Log:
provide cxxabi.h with libsupc++ too
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.28 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.27&r2=1.28
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog 24 Jul 2013 01:05:39 -0000 1.27
+++ ChangeLog 24 Jul 2013 01:41:52 -0000 1.28
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.27 2013/07/24 01:05:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.28 2013/07/24 01:41:52 aballier Exp $
+
+ 24 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ provide cxxabi.h with libsupc++ too
24 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
expose libcxxrt headers in the libcxx tree as upstream does
1.20 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.19&r2=1.20
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libcxx-9999.ebuild 24 Jul 2013 01:05:39 -0000 1.19
+++ libcxx-9999.ebuild 24 Jul 2013 01:41:52 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.19 2013/07/24 01:05:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.20 2013/07/24 01:41:52 aballier Exp $
EAPI=5
@@ -28,7 +28,7 @@
IUSE="elibc_glibc +libcxxrt static-libs test"
RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?,${MULTILIB_USEDEP}] )
- !libcxxrt? ( sys-devel/gcc[cxx] )"
+ !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )"
DEPEND="${RDEPEND}
test? ( sys-devel/clang )
app-arch/xz-utils"
@@ -49,9 +49,23 @@
else
# Very hackish, see $HOMEPAGE
# If someone has a clever idea, please share it!
- local includes="$(echo | "$(tc-getCXX)" -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
+ local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
+ local libdirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-L/' | tr '\n' ' ')"
+ export libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
append-cppflags -D__GLIBCXX__ ${includes}
- LIBS="-lsupc++ ${LIBS}"
+ LIBS="${libdirs} -lsupc++ ${LIBS}"
+ local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
+ for i in ${libsupcxx_includes} ; do
+ local found=""
+ [ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
+ for j in ${libcxx_gcc_dirs} ; do
+ if [ -f "${j}/${i}" ] ; then
+ cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
+ found=yes
+ fi
+ done
+ [ -n "${found}" ] || die "Header not found: ${i}"
+ done
fi
tc-export AR CC CXX
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-07-26 0:37 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-26 0:37 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/26 00:37:22
Modified: ChangeLog libcxx-9999.ebuild
Log:
Warn if building on top of libsupc++ since it is not well supported.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.30 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.29&r2=1.30
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog 24 Jul 2013 01:44:58 -0000 1.29
+++ ChangeLog 26 Jul 2013 00:37:22 -0000 1.30
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.29 2013/07/24 01:44:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.30 2013/07/26 00:37:22 aballier Exp $
+
+ 26 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ Warn if building on top of libsupc++ since it is not well supported.
24 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
remove useless code from previous commit
1.22 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.21&r2=1.22
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libcxx-9999.ebuild 24 Jul 2013 01:44:58 -0000 1.21
+++ libcxx-9999.ebuild 26 Jul 2013 00:37:22 -0000 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.21 2013/07/24 01:44:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.22 2013/07/26 00:37:22 aballier Exp $
EAPI=5
@@ -35,6 +35,14 @@
DOCS=( CREDITS.TXT )
+pkg_setup() {
+ if ! use libcxxrt ; then
+ ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
+ ewarn "libsupc++. Please note that this is not well supported."
+ ewarn "In particular, static linking will not work."
+ fi
+}
+
src_prepare() {
cp -f "${FILESDIR}/Makefile" lib/ || die
multilib_copy_sources
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
@ 2013-07-26 0:44 Alexis Ballier (aballier)
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-26 0:44 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/26 00:44:05
Modified: ChangeLog libcxx-9999.ebuild
Log:
Die if someone tries to build it with <gcc-4.7. Based on a patch by Yuta SATOH in bug #475294
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.31 sys-libs/libcxx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/ChangeLog?r1=1.30&r2=1.31
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog 26 Jul 2013 00:37:22 -0000 1.30
+++ ChangeLog 26 Jul 2013 00:44:05 -0000 1.31
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.30 2013/07/26 00:37:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.31 2013/07/26 00:44:05 aballier Exp $
+
+ 26 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ Die if someone tries to build it with <gcc-4.7. Based on a patch by Yuta
+ SATOH in bug #475294
26 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
Warn if building on top of libsupc++ since it is not well supported.
1.23 sys-libs/libcxx/libcxx-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild?r1=1.22&r2=1.23
Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libcxx-9999.ebuild 26 Jul 2013 00:37:22 -0000 1.22
+++ libcxx-9999.ebuild 26 Jul 2013 00:44:05 -0000 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.22 2013/07/26 00:37:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.23 2013/07/26 00:44:05 aballier Exp $
EAPI=5
@@ -41,6 +41,11 @@
ewarn "libsupc++. Please note that this is not well supported."
ewarn "In particular, static linking will not work."
fi
+ if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
+ eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
}
src_prepare() {
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-07-26 0:44 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-03 18:38 [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2013-07-26 0:44 Alexis Ballier (aballier)
2013-07-26 0:37 Alexis Ballier (aballier)
2013-07-24 1:41 Alexis Ballier (aballier)
2013-07-24 1:00 Alexis Ballier (aballier)
2013-07-03 21:52 Alexis Ballier (aballier)
2013-07-03 21:17 Alexis Ballier (aballier)
2013-05-30 23:36 Alexis Ballier (aballier)
2013-05-30 23:21 Alexis Ballier (aballier)
2013-05-30 21:48 Alexis Ballier (aballier)
2012-05-28 13:59 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox