From: "Alexis Ballier (aballier)" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild
Date: Wed, 3 Jul 2013 21:52:45 +0000 (UTC) [thread overview]
Message-ID: <20130703215245.94E342171C@flycatcher.gentoo.org> (raw)
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() {
next reply other threads:[~2013-07-03 21:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 21:52 Alexis Ballier (aballier) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-07-26 0:44 [gentoo-commits] gentoo-x86 commit in sys-libs/libcxx: ChangeLog libcxx-9999.ebuild 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:17 Alexis Ballier (aballier)
2013-07-03 18:38 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)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130703215245.94E342171C@flycatcher.gentoo.org \
--to=aballier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox