Build and installa lso libm.

Package-Manager: portage-2.1_pre9-r4

3 files changed, 32 insertions, 16 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 2fcdcfa49d5e..7030445aba57 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.8 2006/04/25 18:49:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.9 2006/04/25 19:55:42 flameeyes Exp $
+
+  25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-lib-6.0-r2.ebuild:
+  Build and installa lso libm.
 
   25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-lib-6.0-r2.ebuild:
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index af64b8be360c..ab5342567bc5 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -33,14 +33,14 @@ DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae
 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
+EBUILD freebsd-lib-6.0-r2.ebuild 6235 RMD160 05dac327bdbf16cac40fe597ca2934ee0f5ab3ef SHA1 45d3e74031110dc380fa031deee6a2f3122a7973 SHA256 ab2255cde8346bcbd5d593d5920805e370edd694c1803485c8003c102bc2fdd2 size 6235
+MD5 ad1f3e132f20e8f3a38c2815bb71b043 freebsd-lib-6.0-r2.ebuild 6235
+RMD160 05dac327bdbf16cac40fe597ca2934ee0f5ab3ef freebsd-lib-6.0-r2.ebuild 6235
+SHA256 ab2255cde8346bcbd5d593d5920805e370edd694c1803485c8003c102bc2fdd2 freebsd-lib-6.0-r2.ebuild 6235
+MISC ChangeLog 6890 RMD160 3af2ef04b9cc84fb700d620798faf81d100a3cf5 SHA1 4164fc3f09796e134fd955025b8f5b8f10dd645b SHA256 6bd88ec7a45e5b1f3f5569a14239bd046df9708631000eab78ccdb4f5bf84a28 size 6890
+MD5 0a6343d3f4cdf68b2277ae224461f561 ChangeLog 6890
+RMD160 3af2ef04b9cc84fb700d620798faf81d100a3cf5 ChangeLog 6890
+SHA256 6bd88ec7a45e5b1f3f5569a14239bd046df9708631000eab78ccdb4f5bf84a28 ChangeLog 6890
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -51,7 +51,7 @@ SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFETm9aAiZjviIA2XgRAipXAKCq8M4O5F7LK12nv4h63R5RMBlduQCg5n9i
-wo/XYlJ9G1tiZfFn1KjzIz0=
-=af8p
+iD8DBQFETn7IAiZjviIA2XgRAsjyAKDVltqdFXBTdMg4IjhnvDd4fHjZBQCg2QGi
+LXG0Jztu8B6++Vqk0fyycPA=
+=f9WT
 -----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 27f10c5b4bba..39fbbfe6d042 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.2 2006/04/25 18:49:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild,v 1.3 2006/04/25 19:55:42 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
@@ -119,11 +119,14 @@ src_compile() {
 		export YACC='yacc -by'
 		CHOST=${CTARGET} tc-export CC LD CXX
 
+		local machine
+		machine=$(tc-arch-kernel ${CTARGET})
+
 		local csudir
-		if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
+		if [[ -d "${S}/csu/${machine}-elf" ]]; then
+			csudir="${S}/csu/${machine}-elf"
 		else
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
+			csudir="${S}/csu/${machine}"
 		fi
 		cd "${csudir}"
 		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
@@ -133,6 +136,10 @@ src_compile() {
 		append-ldflags "-B ${csudir}"
 		cd "${S}/libc"
 		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+
+		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
+		cd "${S}/msun"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
 	else
 		cd "${S}"
 		freebsd_src_compile
@@ -175,6 +182,11 @@ src_install() {
 		cd "${S}/libc"
 		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
 			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/lib" || die "Install failed"
+
+		cd "${S}/msun"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/lib" || die "Install failed"
 	else
 		cd "${S}"
 		mkinstall || die "Install failed"