Do not force "lib" symlinks for cross-compiling setups. Follow the same code paths as native builds.

(Portage version: 2.2.0_alpha65/cvs/Linux x86_64)

3 files changed, 28 insertions, 25 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index cc41dd8f4f15..1f7499ada649 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.791 2011/09/29 21:13:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.792 2011/10/11 21:20:30 vapier Exp $
+
+  11 Oct 2011; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/src_compile.eblit, files/eblits/src_install.eblit:
+  Do not force "lib" symlinks for cross-compiling setups. Follow the same code
+  paths as native builds.
 
   29 Sep 2011; Mike Frysinger <vapier@gentoo.org>
   glibc-2.9_p20081201-r3.ebuild, glibc-2.10.1-r1.ebuild, glibc-2.11.3.ebuild,
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index c47c8455ec1e..0a44688234db 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.18 2011/09/19 17:07:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.19 2011/10/11 21:20:30 vapier Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -198,10 +198,10 @@ eblit-glibc-src_compile() {
 		local abilist=""
 		if has_multilib_profile ; then
 			abilist=$(get_install_abis)
-			einfo "Building multilib glibc for ABIs: ${abilist}"
 		elif is_crosscompile || tc-is-cross-compiler ; then
 			abilist=${DEFAULT_ABI}
 		fi
+		einfo "Building glibc for ABIs: ${abilist}"
 		if [[ -n ${abilist} ]] ; then
 			OABI=${ABI}
 			for ABI in ${abilist} ; do
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 7cc838a5e741..bb2d674f78ba 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.15 2011/07/08 15:38:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.16 2011/10/11 21:20:30 vapier Exp $
 
 toolchain-glibc_src_install() {
 	local GBUILDDIR
@@ -73,27 +73,6 @@ toolchain-glibc_src_install() {
 	# We'll take care of the cache ourselves
 	rm -f "${D}"/etc/ld.so.cache
 
-	# When cross-compiling for a non-multilib setup, make sure we have
-	# lib and a proper symlink setup
-	if is_crosscompile && ! use multilib && ! has_multilib_profile && [[ $(get_libdir) != "lib" ]] ; then
-		cd "${D}"$(alt_libdir)/..
-		mv $(get_libdir) lib || die
-		ln -s lib $(get_libdir) || die
-		cd "${D}"$(alt_usrlibdir)/..
-		mv $(get_libdir) lib || die
-		ln -s lib $(get_libdir) || die
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		return 0
-	fi
-
 	# Everything past this point just needs to be done once ...
 	is_final_abi || return 0
 
@@ -111,6 +90,25 @@ toolchain-glibc_src_install() {
 		esac
 	fi
 
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		cd "${D}"$(alt_libdir)/..
+		[[ -e lib ]] || mkdir lib
+		cd "${D}"$(alt_usrlibdir)/..
+		[[ -e lib ]] || mkdir lib
+
+		dosym usr/include /usr/${CTARGET}/sys-include
+		return 0
+	fi
+
 	# Files for Debian-style locale updating
 	dodir /usr/share/i18n
 	sed \