backport sysroot stuff

Package-Manager: portage-2.1.1

3 files changed, 29 insertions, 41 deletions

diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 1fd9a1509a16..7a14d90834e3 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -7,14 +7,14 @@ DIST uClibc-0.9.27.tar.bz2 1693895 RMD160 4c580c0c468bcd7e77a6b4223847f17b6ad241
 DIST uClibc-0.9.28-patches-1.3.tar.bz2 22522 RMD160 f12b3f4b3131a4a76767b089f1b813182192f8e5 SHA1 948558b10df5c7ce295ef8bfad4f13aa91fafb70 SHA256 362047c2773ad2e328dfd59e0033f5fc111afc571c34c2de90a822616fc29a9b
 DIST uClibc-0.9.28.tar.bz2 1763847 RMD160 41646bd94459a9c6f10aea4a4483fa4fedf30e7d SHA1 9124a6e5b0454da3f967725d54fde806189ad27b SHA256 c8bc5383eafaa299e9874ae50acc6549f8b54bc29ed64a9a3387b3e4cd7f4bcb
 DIST uClibc-locale-030818.tgz 236073 RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 SHA1 78f901e6ed228ed84106bd034c1b97eee1eecb50 SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57
-EBUILD uclibc-0.9.27-r1.ebuild 12134 RMD160 d750e966a1a9ccc339f36bf6ee8eedecd04744e6 SHA1 c7ab6d9d6a13f62f8ac45c3c6f154e0ff5488290 SHA256 de3236475de94ca78f7c1dba98101874f374f61e73a12055a66f2a20a0c85b42
-MD5 3bcd2d9432e7c4dfbbe15a5e393b0a1a uclibc-0.9.27-r1.ebuild 12134
-RMD160 d750e966a1a9ccc339f36bf6ee8eedecd04744e6 uclibc-0.9.27-r1.ebuild 12134
-SHA256 de3236475de94ca78f7c1dba98101874f374f61e73a12055a66f2a20a0c85b42 uclibc-0.9.27-r1.ebuild 12134
-EBUILD uclibc-0.9.28.ebuild 13813 RMD160 c4cd8348aca9fadcd1f40b48eaecde3c0828d7c3 SHA1 d4d675ba0d4235e9973a93be2897af9057b1f168 SHA256 c4e35a5afa79085742b209e389a5ec0223a95b4ffe281f7d12067ae33c37de35
-MD5 5d7a39ad55c543bd5c29d350a975bbb9 uclibc-0.9.28.ebuild 13813
-RMD160 c4cd8348aca9fadcd1f40b48eaecde3c0828d7c3 uclibc-0.9.28.ebuild 13813
-SHA256 c4e35a5afa79085742b209e389a5ec0223a95b4ffe281f7d12067ae33c37de35 uclibc-0.9.28.ebuild 13813
+EBUILD uclibc-0.9.27-r1.ebuild 11945 RMD160 6acd0428465b05f52bd334d9f982c0d4535fbaef SHA1 bae8caee51451c9f387de7fcae41efbdd0dd75a5 SHA256 a9ea22f70963e9b013d3c6c64c97707200189962d52ca3b34c5602ea28198030
+MD5 d4e74f8f6cec0a320e322d782fde4cdb uclibc-0.9.27-r1.ebuild 11945
+RMD160 6acd0428465b05f52bd334d9f982c0d4535fbaef uclibc-0.9.27-r1.ebuild 11945
+SHA256 a9ea22f70963e9b013d3c6c64c97707200189962d52ca3b34c5602ea28198030 uclibc-0.9.27-r1.ebuild 11945
+EBUILD uclibc-0.9.28.ebuild 13819 RMD160 b50cc0fbf84f7382a5eaea53345c293cecbd2ff4 SHA1 669ecbc29a3fe1608887aeb15deb620d57c9798c SHA256 ad8cbc657bd42a509eb441fefb02c63c819258e4e348731bb5b7c1d6334ca3d0
+MD5 095449cad79fa339f3b061f46ea0195e uclibc-0.9.28.ebuild 13819
+RMD160 b50cc0fbf84f7382a5eaea53345c293cecbd2ff4 uclibc-0.9.28.ebuild 13819
+SHA256 ad8cbc657bd42a509eb441fefb02c63c819258e4e348731bb5b7c1d6334ca3d0 uclibc-0.9.28.ebuild 13819
 MISC ChangeLog 10080 RMD160 d06f71d6046b92d8e32515e628b60db99431cfdd SHA1 e0d48e2f11475367546246f4fcbd305b231f2fd4 SHA256 b171987ce7b56532e4889e9e92f2a46640272a0bb1afce7028617a23e58d2468
 MD5 361614f87703e404bd340f09b774e1f1 ChangeLog 10080
 RMD160 d06f71d6046b92d8e32515e628b60db99431cfdd ChangeLog 10080
@@ -32,7 +32,7 @@ SHA256 80090a14aee6fedbe96a78f31486641b1460175f8756845c8973389552b4e2f5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFCP7QamhnQswr0vIRAn2RAJ4iuuJCcJMx4rJcjcuJgf/0u/zo+wCfTOlx
-5jEOetw8ephSOKnPPkU9LB4=
-=Luwu
+iD8DBQFFCQGsamhnQswr0vIRAvnRAKCbgJQy1X12CWJCejj6YiWLa/UdCgCfYz1m
+HV9B3un7MXz9qja3PXw3mVI=
+=VwUi
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
index 32e13466f94e..276186ae75e7 100644
--- a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.27-r1.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.27-r1.ebuild,v 1.17 2006/09/14 07:03:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.18 2006/09/14 07:15:41 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -53,27 +53,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() {
@@ -269,10 +255,10 @@ src_unpack() {
 
 	# we are building against system installed kernel headers
 	sed -i \
-		-e "s:KERNEL_SOURCE.*:KERNEL_SOURCE=\"$(alt_kprefix)\":" \
-		-e "s:SHARED_LIB_LOADER_PREFIX=.*:SHARED_LIB_LOADER_PREFIX=\"$(alt_rprefix)$(get_libdir)\":" \
-		-e "s:DEVEL_PREFIX=.*:DEVEL_PREFIX=\"$(alt_prefix)\":" \
-		-e "s:RUNTIME_PREFIX=.*:RUNTIME_PREFIX=\"$(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
 
 	yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
@@ -352,23 +338,25 @@ 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 PREFIX="${sysroot}" ${target} || die "install failed"
 
 	# remove files coming from kernel-headers
-	rm -rf "${D}"$(alt_prefix)/include/{asm,linux,asm-generic}
+	rm -rf "${D}"${sysroot}/usr/include/{asm,linux,asm-generic}
 
 	# clean up misc cruft
-	find "${D}"$(alt_prefix)/include -type d '(' -name CVS -o -name .svn ')' -print0 | xargs -0 rm -r
-	find "${D}"$(alt_prefix)/include -type f -name .cvsignore -print0 | xargs -0 rm -f
+	find "${D}"${sysroot}/usr/include -type d '(' -name CVS -o -name .svn ')' -print0 | xargs -0 rm -r
+	find "${D}"${sysroot}/usr/include -type f -name .cvsignore -print0 | xargs -0 rm -f
 
 	# 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
 
@@ -397,6 +385,6 @@ pkg_postinst() {
 		# update cache before reloading init
 		/sbin/ldconfig
 		# reload init ...
-		[[ -x /sbin/init ]] && /sbin/init U &> /dev/null
+		[[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
 	fi
 }
diff --git a/sys-libs/uclibc/uclibc-0.9.28.ebuild b/sys-libs/uclibc/uclibc-0.9.28.ebuild
index 36bc23a062df..4ec7c759b3df 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.23 2006/09/14 07:03:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.24 2006/09/14 07:15:41 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -437,6 +437,6 @@ pkg_postinst() {
 		# update cache before reloading init
 		/sbin/ldconfig
 		# reload init ...
-		[[ -x /sbin/init ]] && /sbin/init U &> /dev/null
+		[[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
 	fi
 }