factorize the way of getting the csudir

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

3 files changed, 23 insertions, 24 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index b36ca7ce5d86..5c349cab3780 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.120 2012/05/17 16:25:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.121 2012/05/17 16:58:27 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  factorize the way of getting the csudir
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Factorize some code. Install all the cross-compile libraries in the same
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 681b765b21d6..27c89d7f1bf3 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -61,13 +61,13 @@ EBUILD freebsd-lib-7.2-r1.ebuild 12021 RMD160 83fc0d2ee7e5ff037ae27358d0b345fc28
 EBUILD freebsd-lib-8.0.ebuild 14623 RMD160 3194aa0ab5fda28db1db05b4449d5889251cedc1 SHA1 bbddaa53f36296b2a635c459868cd56fd965de81 SHA256 ba8328339f7c487617d8e1c8754d91ccae38a15073a92b847299aa5e8dfe68da
 EBUILD freebsd-lib-8.2-r1.ebuild 15691 RMD160 24faa71ebac5ed9935f52e8e2036cf2e08632ccd SHA1 a17c950b703f3ec5c4bc094d99c1ea12839855f5 SHA256 e5f57f8252c839e5e16dcb1aa29aacaba09c89d2d443a6b159fcad9210834053
 EBUILD freebsd-lib-9.0-r1.ebuild 15966 RMD160 6b7ae4425b437ba43df030f8a8b530b796878aa4 SHA1 19505d0f2a215ed6c13f2d457871cd834a103119 SHA256 c86b9b4f42fd1339ea81858fe430d3b34c6ee8a663b14369d7f957769951b7ae
-EBUILD freebsd-lib-9.0-r2.ebuild 14244 RMD160 0191f23fa03841af436f7469ae43280f00686094 SHA1 2441c209311ca986d4249f0ae96af8fcdbbde2a7 SHA256 2466b74da135fc43decbe785658acc822dd933919012e28e4667f5a877af716f
-MISC ChangeLog 26170 RMD160 d362a9f46e44e4f095eaacb90ba372ad1244c1b8 SHA1 51ec56c3c1bc5381817a2fadd58afff35f8e8671 SHA256 30ef36e6b725a50520c1f8cad5a2caf09f847ee91c7af3c4a16e780f6497c5cb
+EBUILD freebsd-lib-9.0-r2.ebuild 14156 RMD160 ccde1283723010e8d581238e509f28d4de63577d SHA1 25fd1c348507da9daca65a86e29a23a503d194f4 SHA256 f03957c1da51b161c090e502f6363b4b45d1e533afb0c39cf1e29ad96cdf8243
+MISC ChangeLog 26292 RMD160 91d3d853e04965be92bd65dd4c349cad3ce6c00d SHA1 16ac9a41f11f3bc63c5dd0adfde6f007f0bdb101 SHA256 29e2574fb6da16b7be14555f5a5fa015d27a767f53a100adb723fc29ebd96de9
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1Jn4ACgkQvFcC4BYPU0pTxwCfb2rklTNcI+4MUMntfNt+W9Xr
-cw4AoLYOV221Y4pM9wfYNoiyU7T7DfII
-=Evi9
+iEYEARECAAYFAk+1LjkACgkQvFcC4BYPU0rHWQCgqgKSiLbI8YjlIV+6GH1PK6DL
+BV0AnjU2MukCFTqUDIGyG+vuK1eVfNyY
+=CqUL
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
index f3e9df5f833d..4a8f61262ce3 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.6 2012/05/17 16:25:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.7 2012/05/17 16:58:27 aballier Exp $
 
 EAPI=2
 
@@ -196,6 +196,14 @@ src_prepare() {
 	fi
 }
 
+get_csudir() {
+	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
+		echo "lib/csu/$1-elf"
+	else
+		echo "lib/csu/$1"
+	fi
+}
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -221,21 +229,16 @@ src_compile() {
 		local machine
 		machine=$(tc-arch-kernel ${CTARGET})
 
-		local csudir
-		if [ -d "${S}/csu/${machine}-elf" ]; then
-			csudir="${S}/csu/${machine}-elf"
-		else
-			csudir="${S}/csu/${machine}"
-		fi
+		local csudir="$(get_csudir ${machine})"
 		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${csudir}"
+		cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
 		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
 
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
 		append-flags "-isystem ${WORKDIR}/lib/libutil"
 		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
-		append-flags "-B ${csudir}"
-		append-ldflags "-B ${csudir}"
+		append-flags "-B ${WORKDIR}/${csudir}"
+		append-ldflags "-B ${WORKDIR}/${csudir}"
 
 		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
 		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
@@ -286,14 +289,7 @@ src_install() {
 	local mylibdir=$(get_libdir)
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
-		local csudir
-		if [ -d "${WORKDIR}/lib/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then
-			csudir="lib/csu/$(tc-arch-kernel ${CTARGET})-elf"
-		else
-			csudir="lib/csu/$(tc-arch-kernel ${CTARGET})"
-		fi
-
-		for i in "${csudir}" lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil ; do
+		for i in "$(get_csudir $(tc-arch-kernel ${CTARGET}))" lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil ; do
 			cd "${WORKDIR}/${i}/" || die "missing ${i}."
 			$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
 				INCLUDEDIR="/usr/${CTARGET}/usr/include" \