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

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

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index cc41dd8f4f156c820cbf569ee207e1a665f7047e..1f7499ada649d358f93ec890f130bd16ca21eaa9 100644 (file)
--- 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/Manifest b/sys-libs/glibc/Manifest
index df20094b7623121cda77bd3c6f276b5f2a3ec3f0..e4efb7504c473e280d77448736c87f8d995a3a4e 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -19,8 +19,8 @@ AUX eblits/common.eblit 9254 RMD160 2cd1b2fc996b59fff7533f94b43754a841236e8a SHA
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
 AUX eblits/pkg_preinst.eblit 3764 RMD160 f9a9d43e2d2d8df073be7e1b66655e651cb10740 SHA1 b987e2802201e0f44c357ffc7b92da4aa77cf377 SHA256 41baa253ea529156d628108247545235c4ec377b184e7824bd790eba1361299e
 AUX eblits/pkg_setup.eblit 3318 RMD160 4a38e5f9a385d9134b54ab27a654e9a83eeb9258 SHA1 85341ef8fbf37e3270719cc940d26fd6f1168d6b SHA256 ca79f36240221519e460b8ff08e8453d624731991c3efc27d45068d8c15b756e
-AUX eblits/src_compile.eblit 6040 RMD160 37a5e1eb292314e8a2e774fa0e804131628c7337 SHA1 c90583b4bdc5256e3bedf4fddcd27e3ef265e512 SHA256 4f7d5b71477df1bd630d61abef478352e96a07b14faad7d8c322cde3da73fb48
-AUX eblits/src_install.eblit 7754 RMD160 d13b0283a096d681b3a4f1f4f0499af45ca1c97a SHA1 7b5b4b2da323cdc4ec6c39f2a4b229b7118568b9 SHA256 ae407a96cdff1c053846370a791e4796fb45bc04ae5b7ded06bae0b4861ceff7
+AUX eblits/src_compile.eblit 6030 RMD160 07c1916050bac9c13e472ea5b4c7f08d2fc80787 SHA1 b09709b15f37f029bad44f6f48ed50b5bfe6ce7c SHA256 4efa7dc520bc3f015f99816717f9e781e81fbdff3cfc8e41baf7e637520b206f
+AUX eblits/src_install.eblit 7705 RMD160 2af9080a54569b6241ea2d30af2ffb57fa678c53 SHA1 2e784cc06d1a763aa70c1a72344c30029a19fe97 SHA256 a253b672ee0223e03bd923d5970cb9eb5a0ab8ca9034e4116072477c51aebeba
 AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727
 AUX eblits/src_unpack.eblit 5848 RMD160 8012ba4a31e689080ec2d70156c503b0c36e3119 SHA1 5aab07c312c3ab0624ead0e0a7f7d5cecfe1bf00 SHA256 19f73007557718580860a6e1b7613b4a69a4a639f17a9d3cb9ca2aba9576ccca
 AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8
@@ -56,12 +56,12 @@ EBUILD glibc-2.13-r4.ebuild 8590 RMD160 bec0f41e112bf99eafbc4dd41ffc695abff16040
 EBUILD glibc-2.14.ebuild 8786 RMD160 45031928dfc8ce8fdf47e3d7329101b13a572166 SHA1 d60a737e3c34c39281a1c00850a138f2cd5a6440 SHA256 1e670c24e39377d74840a2d6f2cf721ffee062c25a42c8225867ffaca2ff611a
 EBUILD glibc-2.9_p20081201-r3.ebuild 7749 RMD160 0896e4f14fa9df5ef663e61eea35dc85a8511903 SHA1 859d93f9829a301ba99edc8cfb90f604309d890f SHA256 b8e0b085e3e616a08720d236469f550793ac2869ad1ac50dd719ccb3c154e930
 EBUILD glibc-9999.ebuild 8785 RMD160 ebbd32d8a350f893d12b6c470f6c6a2a01d3c4f0 SHA1 88c914714bd1576de991f9e897d1557c366de098 SHA256 ee841b61a5e1ff1ee80dc092c94ba5b27a90e06ea46c33d05eee8438c110a38c
-MISC ChangeLog 141283 RMD160 580350f3ff2d83004d0146ef9e97cc0565194f44 SHA1 b75e6aa25acfbc38be7c1fcdab98890e6cc88147 SHA256 f5776fa8b1d29c2c6e091697f1b98d6088a07b1ccf87d7222b32024e7373748a
+MISC ChangeLog 141505 RMD160 5ac74f6ba6ca475a5763dd5a179fc39d09db6815 SHA1 99ecdb3abc7e8ce8dfba4d83c6ea6e9cf486090a SHA256 ee0332aa8c5d93c86fc2fe6578df5a96627721ccbd09a4974ec7172e7eaafc97
 MISC metadata.xml 332 RMD160 e7659a736d7c78284e28b8e9a0d295cbc1fdb87f SHA1 7a7a98ab40d45afaa2175656b23b04748e06d930 SHA256 32e7e4ccedeb7416e2399a3b5f5ffbd0722892548c427da0e62c8196a52a73f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6E35MACgkQaC/OocHi7JbuvAD/YZyEEcty0LrmpjwRHizZQv0G
-De4yml99Lu2dl3/Y31ABAJYhI1gVsVJoC0h1porZmDP0Ee5rYcNYaMmiBGXbAqza
-=874F
+iF4EAREIAAYFAk6UsyUACgkQaC/OocHi7JbcEgD7BkNguC62qBLTGa4QiKL77yog
+VoJCBUEJ0uCUkPUghHUA/3pq5Iaue58xoLfYpn700ZdYqbPH9nbe1rgtQUWKZxSb
+=3men
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index c47c8455ec1e6d03aa32116e359e0ed3d10fd1df..0a44688234db2e8c5791d325751547ff07970e38 100644 (file)
--- 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 7cc838a5e74178c21923ca7db0e692d05ff93da5..bb2d674f78bab54cfe83ea9379d4cde175fa8e45 100644 (file)
--- 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 \