[patch] patch for libcxxrt-0.0_p20130531.ebuild

475294-libcxxrt-0.0_p20130531.ebuild.patch (text/plain), 1.86 KB, created by Yuta SATOH on 2013-06-30 12:26:00 UTC

--- libcxxrt-0.0_p20130531.ebuild.orig	2013-06-01 23:31:32.000000000 +0900
+++ libcxxrt-0.0_p20130531.ebuild	2013-06-30 21:21:35.000000000 +0900
@@ -8,7 +8,7 @@
 
 [ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
 
-inherit base flag-o-matic toolchain-funcs portability ${SCM}
+inherit base flag-o-matic toolchain-funcs portability multilib multilib-minimal ${SCM}
 
 DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD."
 HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
@@ -36,29 +36,36 @@
 	base_src_prepare
 	cp "${FILESDIR}/Makefile" src/ || die
 	cp "${FILESDIR}/Makefile.test" test/Makefile || die
+	multilib_copy_sources
 }
 
-src_compile() {
+multilib_src_compile() {
 	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
 	# libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc.
 	tc-export CC CXX AR
 	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-	cd "${S}/src"
+	cd "${BUILD_DIR}/src"
 	LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared
 	use static-libs && emake static
 }
 
-src_test() {
-	cd "${S}/test"
-	LD_LIBRARY_PATH="${S}/src:${LD_LIBRARY_PATH}" LIBS="-L${S}/src -lcxxrt -lc" emake check
+multilib_src_test() {
+	cd "${BUILD_DIR}/test"
+	if [[ ${ABI} == x86_fbsd ]] && has_multilib_profile ; then
+		LD_32_LIBRARY_PATH="${BUILD_DIR}/src:${LD_32_LIBRARY_PATH}" LIBS="-L${BUILD_DIR}/src -lcxxrt -lc" emake check
+	else
+		LD_LIBRARY_PATH="${BUILD_DIR}/src:${LD_LIBRARY_PATH}" LIBS="-L${BUILD_DIR}/src -lcxxrt -lc" emake check
+	fi
 }
 
-src_install() {
+multilib_src_install() {
 	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
 	# it. FreeBSD head installs it in /lib
 	dolib.so src/${PN}.so*
 	use static-libs && dolib.a src/${PN}.a
+}
 
+multilib_src_install_all() {
 	insinto /usr/include/libcxxrt/
 	doins src/cxxabi.h src/unwind*.h