Improve support for crosscompilation, now freebsd-lib actually compiles and install fine on Gentoo/Linux AMD64.

Package-Manager: portage-2.1_pre9-r4

3 files changed, 79 insertions, 24 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 2b6b59f6cdff..2fcdcfa49d5e 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.7 2006/04/20 07:40:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.8 2006/04/25 18:49:52 flameeyes Exp $
+
+  25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-lib-6.0-r2.ebuild:
+  Improve support for crosscompilation, now freebsd-lib actually compiles and
+  install fine on Gentoo/Linux AMD64.
+
+  25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-lib-6.0-r2.ebuild:
+  Improve support for crosscompilation, now freebsd-lib actually compiles and
+  install fine on Gentoo/Linux AMD64.
 
 *freebsd-lib-6.0-r2 (20 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 3e1c971105fa..af64b8be360c 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,40 +1,57 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 41083ff0e179939c69314362749098f1 ChangeLog 6378
-RMD160 436b5288c5c39ba23d23fcf01cac9a963a4c8aef ChangeLog 6378
-SHA256 84d23eebc10f7445bc537be810623655269066d0aeddaf5214b19a99f8801eb2 ChangeLog 6378
-MD5 c15a1a49762c0863cbfa4bd5be03f174 files/digest-freebsd-lib-6.0-r2 2072
-RMD160 6c9ffd60849a62554acd27568cc21f1b76692ca3 files/digest-freebsd-lib-6.0-r2 2072
-SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/digest-freebsd-lib-6.0-r2 2072
+AUX freebsd-lib-6.0-binutils-asm.patch 1096 RMD160 1d2c2e60f2c8ca49fb8b01c65aca65b5cd59ea23 SHA1 1533aef95476da5b631d2ffb9b4892773ee5b2ae SHA256 5794228b1754d0b0a9a46fbae7e117ca91ca7da1d842339b279a4185014cbfd9 size 1096
 MD5 7cb2f45f53fcb2792c6fca10be03d948 files/freebsd-lib-6.0-binutils-asm.patch 1096
 RMD160 1d2c2e60f2c8ca49fb8b01c65aca65b5cd59ea23 files/freebsd-lib-6.0-binutils-asm.patch 1096
 SHA256 5794228b1754d0b0a9a46fbae7e117ca91ca7da1d842339b279a4185014cbfd9 files/freebsd-lib-6.0-binutils-asm.patch 1096
+AUX freebsd-lib-6.0-flex-2.5.31.patch 421 RMD160 6ef83c6b09e31a81ba3c25772b02aef34540dbe8 SHA1 1408a36a967b0ff5ba94e23921357f4296e31bc2 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 size 421
 MD5 cc6c35a3fc9a14a31e4ee800b53f0c5c files/freebsd-lib-6.0-flex-2.5.31.patch 421
 RMD160 6ef83c6b09e31a81ba3c25772b02aef34540dbe8 files/freebsd-lib-6.0-flex-2.5.31.patch 421
 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 files/freebsd-lib-6.0-flex-2.5.31.patch 421
+AUX freebsd-lib-6.0-gccfloat.patch 542 RMD160 564f5a1b1aba59479c22f91570635de717e8b7bf SHA1 94f463f123fdc3009d4ca1d5ab351aa76d768c6b SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 size 542
 MD5 a4bca3651c5476d3b75d866a60030bcb files/freebsd-lib-6.0-gccfloat.patch 542
 RMD160 564f5a1b1aba59479c22f91570635de717e8b7bf files/freebsd-lib-6.0-gccfloat.patch 542
 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 files/freebsd-lib-6.0-gccfloat.patch 542
+AUX freebsd-lib-6.0-pmc.patch 338 RMD160 bb284cc2f9eafd3f65090087af215c3da679fefa SHA1 18343fc612bd231ec722b579dff61c887542b1c2 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f size 338
 MD5 d2f9a1d35ae1aba75cc56b4ee3e12b68 files/freebsd-lib-6.0-pmc.patch 338
 RMD160 bb284cc2f9eafd3f65090087af215c3da679fefa files/freebsd-lib-6.0-pmc.patch 338
 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f files/freebsd-lib-6.0-pmc.patch 338
+AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 size 339
 MD5 0fa8fbe7549748636959ef4bc4ea9660 files/freebsd-lib-bsdxml.patch 339
 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 files/freebsd-lib-bsdxml.patch 339
 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 files/freebsd-lib-bsdxml.patch 339
+AUX freebsd-lib-fixmp.patch 548 RMD160 91cf241eaa972c13ea6ddd1ec03a6fd7f3a2a4b3 SHA1 5d402589db0ef38d528303860f41d5244049047d SHA256 bd99697872b00a4275c80935f4f5188f4f859aa358be0ecfc0c5470e9979c354 size 548
 MD5 eb10216ffda9c5f69fdb28728c574114 files/freebsd-lib-fixmp.patch 548
 RMD160 91cf241eaa972c13ea6ddd1ec03a6fd7f3a2a4b3 files/freebsd-lib-fixmp.patch 548
 SHA256 bd99697872b00a4275c80935f4f5188f4f859aa358be0ecfc0c5470e9979c354 files/freebsd-lib-fixmp.patch 548
-MD5 da4b0283888076c03e1d4125b44c7104 freebsd-lib-6.0-r2.ebuild 4895
-RMD160 8b674784cbdd403412b062ea9d123b1f116d2dde freebsd-lib-6.0-r2.ebuild 4895
-SHA256 f2e7b957e8904be211e74431c085100524a370810c787c0b5b3e7e66031f553a freebsd-lib-6.0-r2.ebuild 4895
+DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
+DIST freebsd-crypto-6.0.tar.bz2 3978650 RMD160 361efbba1f651925a7cc2284665b044bc232f181 SHA256 e86223d40ef2747de98f575f3875a6ce8a5e913baa850a5ef547ffef00ace480 size 3978650
+DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
+DIST freebsd-include-6.0.tar.bz2 127219 RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b size 127219
+DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
+DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
+DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
+DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
+EBUILD freebsd-lib-6.0-r2.ebuild 5868 RMD160 b22bb7a0cd26648e178596b000d50238bd9859a7 SHA1 0bc01203e205697011bc02e2d3b2e7f9525abf8c SHA256 05a8b7afc69c110cf95b69e2e9d2e8feb8d767c9ec84be2f4314bf41ef0d35e9 size 5868
+MD5 db848a821ac4935125a8f75610cf4d74 freebsd-lib-6.0-r2.ebuild 5868
+RMD160 b22bb7a0cd26648e178596b000d50238bd9859a7 freebsd-lib-6.0-r2.ebuild 5868
+SHA256 05a8b7afc69c110cf95b69e2e9d2e8feb8d767c9ec84be2f4314bf41ef0d35e9 freebsd-lib-6.0-r2.ebuild 5868
+MISC ChangeLog 6776 RMD160 22e242fad48f08461b9b2f8129b4f878d801fb8b SHA1 de7bd759d76c0af9f70cdee41d1f88584feceb36 SHA256 11c3c715cee88f575386fce8d1690678b96719342dc33364423f31a234d12266 size 6776
+MD5 770e95b85e4885e5146002e0f58ca921 ChangeLog 6776
+RMD160 22e242fad48f08461b9b2f8129b4f878d801fb8b ChangeLog 6776
+SHA256 11c3c715cee88f575386fce8d1690678b96719342dc33364423f31a234d12266 ChangeLog 6776
+MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
+MD5 c15a1a49762c0863cbfa4bd5be03f174 files/digest-freebsd-lib-6.0-r2 2072
+RMD160 6c9ffd60849a62554acd27568cc21f1b76692ca3 files/digest-freebsd-lib-6.0-r2 2072
+SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/digest-freebsd-lib-6.0-r2 2072
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFERzooAiZjviIA2XgRAl72AKC4R/k2L+WfgUqJO2mxdZDSBLb2jgCgyrvx
-RC41dTg5L1124vc/n5NsRlU=
-=DIKy
+iD8DBQFETm9aAiZjviIA2XgRAipXAKCq8M4O5F7LK12nv4h63R5RMBlduQCg5n9i
+wo/XYlJ9G1tiZfFn1KjzIz0=
+=af8p
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild
index 48b8cb81c4ef..27f10c5b4bba 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild,v 1.1 2006/04/20 07:40:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild,v 1.2 2006/04/25 18:49:52 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
@@ -31,8 +31,10 @@ DEPEND="${RDEPEND}
 	=sys-freebsd/freebsd-mk-defs-${RV}*
 	=sys-freebsd/freebsd-sources-${RV}*"
 
-PROVIDE="virtual/libc
-	virtual/os-headers"
+if [[ ${CATEGORY/cross-} == {CATEGORY} ]]; then
+	PROVIDE="virtual/libc
+		virtual/os-headers"
+fi
 
 S="${WORKDIR}/lib"
 
@@ -113,16 +115,28 @@ src_compile() {
 
 	use _E_CROSS_HEADERS_ONLY && return 0
 
-	cd "${S}"
-
 	if [[ ${CTARGET} != ${CHOST} ]]; then
-		cd "${S}/libc"
 		export YACC='yacc -by'
 		CHOST=${CTARGET} tc-export CC LD CXX
 
+		local csudir
+		if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
+		else
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
+		fi
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
+
 		append-flags "-isystem /usr/${CTARGET}/include"
+		append-flags "-B ${csudir}"
+		append-ldflags "-B ${csudir}"
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+	else
+		cd "${S}"
+		freebsd_src_compile
 	fi
-	freebsd_src_compile
 }
 
 src_install() {
@@ -147,10 +161,24 @@ src_install() {
 
 	use _E_CROSS_HEADERS_ONLY && return 0
 
-	cd "${S}"
+	if [[ ${CTARGET} != ${CHOST} ]]; then
+		local csudir
+		if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
+		else
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
+		fi
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
+			FILESDIR="/usr/${CTARGET}/lib" || die "Install csu failed"
 
-	[[ ${CTARGET} != ${CHOST} ]] && cd "${S}/libc"
-	mkinstall || die "Install failed"
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/lib" || die "Install failed"
+	else
+		cd "${S}"
+		mkinstall || die "Install failed"
+	fi
 
 	# Don't install the rest of the configuration files if crosscompiling
 	[[ ${CTARGET} != ${CHOST} ]] && return 0