[patch] dirty sample patch for libcxxrt-0.0_p20130531-r1.ebuild (target rev 1.4)

475294-libcxxrt-0.0_p20130531-1.4.ebuild.patch (text/plain), 3.38 KB, created by Yuta SATOH on 2013-07-03 12:08:19 UTC

diff --git a/libcxx-0.0_p20130531-r1.ebuild b/libcxx-0.0_p20130531-r1.ebuild
index db229d2..4f231cf 100644
--- a/libcxx-0.0_p20130531-r1.ebuild
+++ b/libcxx-0.0_p20130531-r1.ebuild
@@ -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 multilib
+inherit cmake-utils cmake-multilib ${SCM} base flag-o-matic toolchain-funcs multilib multilib-build
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
 HOMEPAGE="http://libcxx.llvm.org/"
@@ -33,12 +33,24 @@ DEPEND="${RDEPEND}
 	sys-devel/clang
 	app-arch/xz-utils"
 
-PATCHES=( "${FILESDIR}/multilib.patch" )
+PATCHES=( "${FILESDIR}/multilib.patch"
+	"${FILESDIR}/${PN}-0.0_p20130531-minimal-build.patch" )
 DOCS=( "CREDITS.TXT" )
 
+minimal_build_libcxx(){
+	cd ${BUILD_DIR}/lib
+	case ${ABI} in
+		x86|x86_fbsd)	local append_opt="-m32" ;;
+	esac
+	CC="clang -nostdlib ${append_opt}" CXX="clang++ -nostdlib ${append_opt}" ./buildit
+	append-ldflags "-L${BUILD_DIR}/lib"
+}
+
 src_prepare() {
 	use libcxxrt && PATCHES+=( "${FILESDIR}/cxxrt.patch" )
 	base_src_prepare
+	multilib_copy_sources
+	multilib_foreach_abi minimal_build_libcxx
 }
 
 src_configure() {
@@ -61,30 +73,46 @@ src_configure() {
 	# Needs to be built with clang. gcc-4.6.3 fails at least.
 	# TODO: cross-compile ?
 	export CC="clang"
-	export CXX="clang++"
+	export CXX="clang++ -stdlib=libc++"
 
 	if use static-libs ; then
 		local mycmakeargs=( "${mycmakeargs_base[@]}" "-DLIBCXX_ENABLE_SHARED=OFF" )
-		BUILD_DIR="${S}_static"	cmake-utils_src_configure
+		BUILD_DIR="${S}_static"	cmake-multilib_src_configure
 	fi
 	local mycmakeargs=( "${mycmakeargs_base[@]}" )
-	BUILD_DIR="${S}_shared" cmake-utils_src_configure
+	BUILD_DIR="${S}_shared" cmake-multilib_src_configure
 }
 
 src_compile() {
-	use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_compile
-	BUILD_DIR="${S}_shared" cmake-utils_src_compile
+	use static-libs && BUILD_DIR="${S}_static" cmake-multilib_src_compile
+	BUILD_DIR="${S}_shared" cmake-multilib_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}" \
+	do_libcxx_multilib_test(){
+		cp -rp "${S}"/test/* "${BUILD_DIR}"/test/
+		cd "${BUILD_DIR}/test"
+
+		case ${ABI} in
+			x86|x86_fbsd)	local append_opt="-m32" ;;
+		esac
+
+		if [[ ${ABI} == x86_fbsd ]] ; then
+			export LD_32_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}"
+		else
+			export LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}"
+		fi
+
 		CC="clang++" \
-		HEADER_INCLUDE="-I${S}/include" \
-		SOURCE_LIB="-L${S}_shared/lib" \
-		LIBS="-lm" \
-		./testit || die
+			OPTIONS="${append_opt} -std=c++0x -stdlib=libc++" \
+			HEADER_INCLUDE="-I${BUILD_DIR}/include" \
+			SOURCE_LIB="-L${BUILD_DIR}/lib" \
+			LIBS="-lm" \
+			./testit || die
+	}
+
+	BUILD_DIR="${S}_shared" multilib_foreach_abi do_libcxx_multilib_test
 }
 
 gen_static_ldscript() {
@@ -118,10 +146,10 @@ END_LDSCRIPT
 
 src_install() {
 	if use static-libs ; then
-		BUILD_DIR="${S}_static" cmake-utils_src_install
-		gen_static_ldscript
+		BUILD_DIR="${S}_static" cmake-multilib_src_install
+		multilib_foreach_abi gen_static_ldscript
 	fi
-	BUILD_DIR="${S}_shared" cmake-utils_src_install
+	BUILD_DIR="${S}_shared" cmake-multilib_src_install
 }
 
 pkg_postinst() {