add support for sysroot when cross-compiling

Package-Manager: portage-2.1_pre7-r5

2 files changed, 23 insertions, 35 deletions

diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 3176e453702d..c432860e4b88 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -16,13 +16,13 @@ SHA256 0be91c12da3e7c119ee885d360c0e983a69f0141614902bb2de6c54c08d4c56c metadata
 MD5 639ff5195e1aa9de64a39cb668eb6684 uclibc-0.9.27-r1.ebuild 12132
 RMD160 72cb116fe622f2c86236997c7833ae9aa4ff7c9d uclibc-0.9.27-r1.ebuild 12132
 SHA256 5bc52cddb322a83d2b6d33b2da0aab3535ac2a65264ebc76c8556bba51093025 uclibc-0.9.27-r1.ebuild 12132
-MD5 699ee751c3fe07de2fbb631a0c05dc44 uclibc-0.9.28.ebuild 13976
-RMD160 8a0010a0c97c3357abe211b451dec78e6069d8eb uclibc-0.9.28.ebuild 13976
-SHA256 0cdb258c8fddb3c249c50deb697240ec707dc7e6df2a93147c3d38d2de096fe0 uclibc-0.9.28.ebuild 13976
+MD5 8bf852f9e807736bc12eb6d2701fece4 uclibc-0.9.28.ebuild 13811
+RMD160 963c0526c7a08d5278fc3c38209e71387f2f95f7 uclibc-0.9.28.ebuild 13811
+SHA256 d08ccac70fa192711dee1c79f9aece849819719d05c714764c434a5fee658a72 uclibc-0.9.28.ebuild 13811
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEF3Kc2+ySkm8kpY0RAkm8AJwMj6QGnAhHruoEnf6Nq7JshJKtlwCdGVat
-iw0D6d7q6EuBNklnYs8Q9yY=
-=EsVA
+iD8DBQFEOuhs2+ySkm8kpY0RAioeAJwPX6lYwBA7MBk5nxdAtEssUrFo9wCgpfnt
+CbrvA/Gh3YZmNeGA32z9/do=
+=swz6
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/uclibc/uclibc-0.9.28.ebuild b/sys-libs/uclibc/uclibc-0.9.28.ebuild
index 0cfa82e3795d..9b89681b608b 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.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-libs/uclibc/uclibc-0.9.28.ebuild,v 1.21 2006/03/15 01:47:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.22 2006/04/10 23:21:01 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -51,27 +51,13 @@ fi
 
 S=${WORKDIR}/${MY_P}
 
-alt_kprefix() {
+alt_build_kprefix() {
 	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
 	   || [[ -n ${UCLIBC_AND_GLIBC} ]]
 	then
 		echo /usr
 	else
-		echo /usr/${CTARGET}
-	fi
-}
-alt_prefix() {
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr
-	else
-		echo /usr/${CTARGET}
-	fi
-}
-alt_rprefix() {
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		echo /
-	else
-		echo /usr/${CTARGET}/
+		echo /usr/${CTARGET}/usr
 	fi
 }
 just_headers() {
@@ -150,9 +136,9 @@ src_unpack() {
 	check_cpu_opts
 
 	echo
-	einfo "Runtime Prefix: $(alt_rprefix)"
-	einfo "Kernel Prefix:  $(alt_kprefix)"
-	einfo "Devel Prefix:   $(alt_prefix)"
+	einfo "Runtime Prefix: /"
+	einfo "Devel Prefix:   /usr"
+	einfo "Kernel Prefix:  $(alt_build_kprefix)"
 	einfo "CBUILD:         ${CBUILD}"
 	einfo "CHOST:          ${CHOST}"
 	einfo "CTARGET:        ${CTARGET}"
@@ -342,10 +328,10 @@ src_unpack() {
 	type -p ${cross}ar > /dev/null || cross=""
 	sed -i \
 		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${cross}\":" \
-		-e "/^KERNEL_SOURCE/s:=.*:=\"$(alt_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"$(alt_rprefix)$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"$(alt_prefix)\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"$(alt_rprefix)\":" \
+		-e "/^KERNEL_SOURCE/s:=.*:=\"$(alt_build_kprefix)\":" \
+		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
+		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
+		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
 		.config || die
 
 	yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
@@ -408,24 +394,26 @@ src_test() {
 }
 
 src_install() {
+	local sysroot=${D}
+	[[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}"
+
 	local target="install"
 	just_headers && target="install_dev"
-	make PREFIX="${D}" ${target} || die "install failed"
+	make DESTDIR="${sysroot}" ${target} || die "install failed"
 
 	# remove files coming from kernel-headers
-	rm -rf "${D}"$(alt_prefix)/include/{linux,asm*}
+	rm -rf "${sysroot}"/usr/include/{linux,asm*}
 
 	# Make sure we install the sys-include symlink so that when 
 	# we build a 2nd stage cross-compiler, gcc finds the target 
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		dosym include $(alt_prefix)/sys-include
-		dosym . $(alt_prefix)/usr
+		dosym usr/include /usr/${CTARGET}/sys-include
 		return 0
 	fi
 
 	if [[ ${CHOST} == *-uclibc ]] ; then
-		make PREFIX="${D}" install_utils || die "install-utils failed"
+		make DESTDIR="${D}" install_utils || die "install-utils failed"
 		dobin extra/scripts/getent
 	fi