fix cross compilation, build and install libthr/libpthread when cross compiling too

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

3 files changed, 23 insertions, 8 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 6dd910472821..80bb2de16bfd 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.94 2011/07/10 17:47:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.95 2011/07/11 21:06:44 aballier Exp $
+
+  11 Jul 2011; Alexis Ballier <aballier@gentoo.org> freebsd-lib-8.2-r1.ebuild:
+  fix cross compilation, build and install libthr/libpthread when cross
+  compiling too
 
 *freebsd-lib-8.2-r1 (10 Jul 2011)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 04b1465c35db..8598937550b9 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -47,14 +47,14 @@ DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b6097
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 EBUILD freebsd-lib-7.2-r1.ebuild 12021 RMD160 83fc0d2ee7e5ff037ae27358d0b345fc28938158 SHA1 d91c9328cfbe8e614bda3b93d782a8452dff0c8e SHA256 4cfd26e8299670f33e6fa20094b66e464ed3bd113c899b3374b55678ac4a4dd0
 EBUILD freebsd-lib-8.0.ebuild 14623 RMD160 3194aa0ab5fda28db1db05b4449d5889251cedc1 SHA1 bbddaa53f36296b2a635c459868cd56fd965de81 SHA256 ba8328339f7c487617d8e1c8754d91ccae38a15073a92b847299aa5e8dfe68da
-EBUILD freebsd-lib-8.2-r1.ebuild 15479 RMD160 f587aa741e6b3daa1a9cda0f72c7afa06f09ffa4 SHA1 a6fbd12b5f4fd3ed52af4ed4220fea504a0e017a SHA256 7c3650e38f2685c8879180893bec9183944aae45fdf23c0ccf2333ee57341742
+EBUILD freebsd-lib-8.2-r1.ebuild 16061 RMD160 8fc40b62d99312067951bc858d8c81e7a151ee22 SHA1 788c9dc8b1e593c5da5ffd50f86f038e62434049 SHA256 e4f6624fdf366f08be9f83ae731f3863d2e48217e2eb2afce18057799a3974d1
 EBUILD freebsd-lib-8.2.ebuild 15283 RMD160 e3635dd51b96c56114a52cc1ab593a22b4467573 SHA1 25b0cc1f115fbbac93b521baa742442cf5cfec51 SHA256 96a44aeb3ad0db6f9d37e0483f97313d995de566dd7c85895b51bd1617e74092
-MISC ChangeLog 22046 RMD160 bc1cc05e6be6a80cb46c2220f996d45e8e0666fc SHA1 7573221c7e9d82faba346d79e5461a944753e52d SHA256 e2dd3ee7532416a515946c21504ae2c7b13879d51894e9292b81e6528817b838
+MISC ChangeLog 22214 RMD160 449ee0fa588706d4e377de4c3a1cecd89802ac1c SHA1 d53710eec81873808bd0337673b2ad4b5c80b445 SHA256 b468bf31cf6dab05a62366bb4c7b368e44d0524455aa296c0b588057bd383fbe
 MISC metadata.xml 362 RMD160 535ffb5cb1305012df32a444f602d4ec20a10700 SHA1 fc9fdf3b5fc6d37cf573998d76905bd911c60e07 SHA256 244399668bb611eb11a3b063d11424cbecc2363443d6f78f3f042a566980bbb1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4aEFwACgkQvFcC4BYPU0r6PQCgq82TFFEGmp2YmVijBqMjvcbM
-218An01aNTXJbGjnkGAe9txwfsKslfD8
-=E0q0
+iEYEARECAAYFAk4bZeoACgkQvFcC4BYPU0qzqgCfRlmcTX2gcOdVWyH1RpMj6SUM
+vykAnR9JjrJMAeb5+1p7Rr1LGF+2GtKo
+=nJl+
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
index 24ba5a70c816..7499d15e2ce3 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.2 2011/07/10 17:49:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.3 2011/07/11 21:06:44 aballier Exp $
 
 EAPI=2
 
@@ -223,7 +223,7 @@ src_compile() {
 		append-ldflags "-B ${csudir}"
 
 		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
+		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
 		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
 		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
 
@@ -231,7 +231,13 @@ src_compile() {
 		cd "${S}/libc"
 		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
 		cd "${S}/msun"
+		append-ldflags "-L${WORKDIR}/lib/libc"
+		export RAW_LDFLAGS=$(raw-ldflags)
 		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
+		cd "${WORKDIR}/lib/libthr/" || die "missing libthr"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libthr failed"
 	else
 		# Forces to use the local copy of headers as they might be outdated in
 		# the system
@@ -293,6 +299,11 @@ src_install() {
 			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
 			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ssp failed"
 
+		cd "${WORKDIR}/lib/libthr/"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libthr failed"
+
 		dosym "usr/include" "/usr/${CTARGET}/sys-include"
 	else
 		# Set SHLIBDIR and LIBDIR for multilib