Generate a libc++.a ldscript for clang++ -stdlib=libc++ -static to work out of the box.

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 177 insertions, 5 deletions

diff --git a/sys-libs/libcxx/ChangeLog b/sys-libs/libcxx/ChangeLog
index ba38e76dd441..cb4cf94b7e0c 100644
--- a/sys-libs/libcxx/ChangeLog
+++ b/sys-libs/libcxx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2013/05/31 15:57:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.18 2013/06/17 18:18:34 aballier Exp $
+
+*libcxx-0.0_p20130531-r1 (17 Jun 2013)
+
+  17 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  +libcxx-0.0_p20130531-r1.ebuild, libcxx-9999.ebuild:
+  Generate a libc++.a ldscript for clang++ -stdlib=libc++ -static to work out
+  of the box.
 
 *libcxx-0.0_p20130531 (31 May 2013)
 
diff --git a/sys-libs/libcxx/libcxx-0.0_p20130531-r1.ebuild b/sys-libs/libcxx/libcxx-0.0_p20130531-r1.ebuild
new file mode 100644
index 000000000000..18137cdf8b22
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-0.0_p20130531-r1.ebuild
@@ -0,0 +1,133 @@
+# 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-0.0_p20130531-r1.ebuild,v 1.1 2013/06/17 18:18:34 aballier Exp $
+
+EAPI=5
+
+ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
+
+[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
+
+inherit cmake-utils ${SCM} base flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="http://libcxx.llvm.org/"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+else
+	SRC_URI=""
+fi
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="elibc_glibc +libcxxrt static-libs"
+
+RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?] )
+	!libcxxrt? ( sys-devel/gcc[cxx] )"
+DEPEND="${RDEPEND}
+	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
+}
+
+src_configure() {
+	local mycmakeargs_base=( )
+	if use libcxxrt ; then
+		mycmakeargs_base=(
+			-DLIBCXX_CXX_ABI=libcxxrt
+			-DLIBCXX_LIBCXXRT_INCLUDE_PATHS="/usr/include/libcxxrt/"
+		 )
+	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}"
+		)
+	fi
+
+	# Needs to be built with clang. gcc-4.6.3 fails at least.
+	# TODO: cross-compile ?
+	export CC=clang
+	export CXX=clang++
+
+	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
+}
+
+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="${S}_shared/lib:${LD_LIBRARY_PATH}" \
+		CC="clang++" \
+		HEADER_INCLUDE="-I${S}/include" \
+		SOURCE_LIB="-L${S}_shared/lib" \
+		LIBS="-lm" \
+		./testit || die
+}
+
+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
+
+		# 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
+	fi
+	# TODO: Generate a libc++.a ldscript when building against libsupc++
+}
+
+src_install() {
+	if use static-libs ; then
+		BUILD_DIR="${S}_static" cmake-utils_src_install
+		gen_static_ldscript
+	fi
+	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."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index b6e69d2a4005..95fbec047ff2 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -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.9 2013/05/31 01:16:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.10 2013/06/17 18:18:34 aballier Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
 
 [ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
 
-inherit cmake-utils ${SCM} base flag-o-matic toolchain-funcs
+inherit cmake-utils ${SCM} base flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="http://libcxx.llvm.org/"
@@ -25,7 +25,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE="+libcxxrt static-libs"
+IUSE="elibc_glibc +libcxxrt static-libs"
 
 RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130530[static-libs?] )
 	!libcxxrt? ( sys-devel/gcc[cxx] )"
@@ -87,8 +87,40 @@ src_test() {
 		./testit || die
 }
 
+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
+
+		# 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
+	fi
+	# TODO: Generate a libc++.a ldscript when building against libsupc++
+}
+
 src_install() {
-	use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_install
+	if use static-libs ; then
+		BUILD_DIR="${S}_static" cmake-utils_src_install
+		gen_static_ldscript
+	fi
 	BUILD_DIR="${S}_shared" cmake-utils_src_install
 }