Pull out the cross-compiler prefix handling into alt_prefix to simplify places that...

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

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 19faae33919d92cafbf5825c527ffc4f46f073e0..43caa0d0e88683327d623b82e80ab8551eb74581 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.808 2011/12/14 16:42:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.809 2011/12/22 01:09:58 vapier Exp $
+
+  22 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit,
+  files/eblits/src_install.eblit:
+  Pull out the cross-compiler prefix handling into alt_prefix to simplify
+  places that need to mess with paths under it.
 
   14 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/pkg_setup.eblit:
   Also filter out glibc binaries when looking for __guard #394453#5 by Michael

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index e6d1facc171290b56d988cbb9b58c5126a409d59..d8d409e0824e18906701f0e2d7096203436e1928 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,12 +15,12 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 RMD160 8746aeb9f9c68ca153d93cf92c9df93
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50b53ce035967a5f SHA1 11ad52117fa55bbe51b429043df49767c7f58de0 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3
-AUX eblits/common.eblit 9323 RMD160 aa42c1ca5b73b68bb6d022355dfa7e149091f23c SHA1 1849da38c293bcfddc0b6446d4e1862d28f0fbe5 SHA256 d3841f2d4d9065754e57b5d9143c54eb278daabde81cf0d27179e281ddd0875a
+AUX eblits/common.eblit 9187 RMD160 cdfe1c09712ce768db308d0afea50fc47dde1c93 SHA1 cd7ca828dd5080280370dca12dc31ce952e44c49 SHA256 01cc70baa55965738eeca9054f5b54a635f05fa9b733e27592990840b31a1cd6
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
 AUX eblits/pkg_preinst.eblit 3469 RMD160 a8f0831802ea5b5bec02b6379f08cd5f4f0ad27a SHA1 31a9a0815f11bd186c27d3cc44a394e4aee754be SHA256 7f947a83488dccd4c5169508d7c125d09fdd30ddd07d98b528ad12d83b9e2730
 AUX eblits/pkg_setup.eblit 3886 RMD160 d2f86a2f404941bc7b6f6dabc29dd293dc2e9972 SHA1 b931c6dbc784f94f80f8ced2d2d0e1f0da4711af SHA256 be9c3dcef8315e52163b98631ea2c170c805f9accbaf5268df292574978c8e71
 AUX eblits/src_compile.eblit 5777 RMD160 589394dbad302c02ba2ca75730938a9d58986980 SHA1 1b827f4f649924558a7c115614ffb20f841ffef7 SHA256 4fec8eb713125dd89c5d2e19b2499dfcca8796943fb437e419e417929c6d92af
-AUX eblits/src_install.eblit 7530 RMD160 40226c9ef9975b7f055326b660338d6cf288082c SHA1 a4ff814e0d6ca59e6ffbff7626c1230958f70370 SHA256 4b1899e2669657ace7fe225b9f737891ae57b455ea5b88d7d844a7858110eeea
+AUX eblits/src_install.eblit 7470 RMD160 e21782fd708e57616b501a9920aeca72cea5cbb7 SHA1 2eed96771de35d77255f3957ff8023a53fdb4e99 SHA256 3a1599442d729d23f678b6582276ea6125855fe2f4c15f36851f89d441f4e145
 AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727
 AUX eblits/src_unpack.eblit 5286 RMD160 6bb0879a4b2eb29872c4099e4d94b64dc7911741 SHA1 288d73641a315537b83d00524431d4cd2c5fb3f0 SHA256 7daf6650a96699e52b48b207a1bcdfa93658871d11ee634a2d52764450978d2f
 AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8
@@ -62,12 +62,12 @@ EBUILD glibc-2.14.1.ebuild 8790 RMD160 f1e9c7f95d2486e79303e7d94a259c224344c171
 EBUILD glibc-2.14.ebuild 8789 RMD160 2526d5682ba5214e88ac1daa1afa46607f53093a SHA1 3cb67afb2d3606f78047ce96c014fd4a7286018a SHA256 1df3c918ad3a947b54bbd8e6b6e6eb441705d4cb9c561228096820dadc045503
 EBUILD glibc-2.9_p20081201-r3.ebuild 7753 RMD160 8d14a32be1c680e21128552fff3e7299710b0255 SHA1 92f5182dce11c5a77e91ebd9129c2c6ff6938974 SHA256 b90aa298fd49569090f711b2bd9368a66c73cb6c37e85525d1d929ef70e09a5b
 EBUILD glibc-9999.ebuild 8789 RMD160 cb7c0aa7866c031533846c94dd632d26cde8b064 SHA1 e3619da20d49aa6b358b6c95b83c94bf34e5bfe4 SHA256 9e7a7444b0aeb1cd27e5689a94a029c637627971f4fd1fb2e4361a0e7b3d6fc9
-MISC ChangeLog 144237 RMD160 cb552e96b1153f9cc448938fa3e579c1f5d0d48b SHA1 43b95a202c7a536b39e6d3646a86c8a95660caaf SHA256 dcde97a34dacb6e74ba2f217fa226ebc58e52ee6e514e1387077ee7171f5d3c4
+MISC ChangeLog 144471 RMD160 514bb76d36d7bf24d025a0969bfdadcb5f3f846f SHA1 b226f3821913553ab7065b877d16550fe2659b84 SHA256 e3bcd1a735590a53529ba051282cd636a0a5bbeb7704a5aba97b27b05d524809
 MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7o0gsACgkQaC/OocHi7JaY5AD/eR6uYZ8MA0euVvLYmgwa1+Ot
-59DAKm+TmxExvOr41ygA+gO9WzvMNky9KY93zTuOUNc/gPm+XLASb4RtrzAT7Gtt
-=n7AS
+iF4EAREIAAYFAk7yg20ACgkQaC/OocHi7JaS5gD/XHBO374gBtJDvX8tNwHGea/1
+SQJuP17mj0ppdPWmXuYBAJ/oxN66i85AH8npcsxuKqy28cc4irCZwZpH8wm7GYLD
+=YukQ
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 47ea221cca44bbba56cfad82bc5308304da43c20..4650d73b7880442f04b00c239ba54ff27d3acec8 100644 (file)
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -1,6 +1,10 @@
 # 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/common.eblit,v 1.24 2011/11/17 21:22:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.25 2011/12/22 01:09:58 vapier Exp $
+
+alt_prefix() {
+       is_crosscompile && echo /usr/${CTARGET}
+}
 
 # We need to be able to set alternative headers for
 # compiling for non-native platform
@@ -8,14 +12,7 @@
 # the whole system.
 # note: intentionally undocumented.
 alt_headers() {
-       if [[ -z ${ALT_HEADERS} ]] ; then
-               if is_crosscompile ; then
-                       ALT_HEADERS="/usr/${CTARGET}/usr/include"
-               else
-                       ALT_HEADERS="/usr/include"
-               fi
-       fi
-       echo "${ALT_HEADERS}"
+       echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
 }
 alt_build_headers() {
        if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
@@ -32,11 +29,7 @@ alt_build_headers() {
 }
 
 alt_usrlibdir() {
-       if is_crosscompile ; then
-               echo /usr/${CTARGET}/usr/$(get_libdir)
-       else
-               echo /usr/$(get_libdir)
-       fi
+       echo $(alt_prefix)/usr/$(get_libdir)
 }
 
 setup_target_flags() {

diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 264dd1a0584d2857c3247c9b420ba3d310a16303..8e757e6d8879f1760df80eb265cc4f91d5f0b64b 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.19 2011/12/12 17:33:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.20 2011/12/22 01:09:58 vapier Exp $
 
 toolchain-glibc_src_install() {
        local GBUILDDIR
@@ -10,8 +10,7 @@ toolchain-glibc_src_install() {
                GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-nptl
        fi
 
-       local install_root=${D}
-       is_crosscompile && install_root="${install_root}/usr/${CTARGET}"
+       local install_root="${D}$(alt_prefix)"
        if want_linuxthreads ; then
                cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
                einfo "Installing GLIBC ${ABI} with linuxthreads ..."
@@ -72,16 +71,15 @@ toolchain-glibc_src_install() {
 
        # Make sure the non-native interp can be found on multilib systems
        if [[ ${SYMLINK_LIB} == "yes" ]] && has_multilib_profile ; then
+               local abi32 ldso
                case $(tc-arch) in
-                       amd64)
-                               [[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-                               dosym ../$(get_abi_LIBDIR x86)/ld-linux.so.2 /lib/ld-linux.so.2
-                               ;;
-                       ppc64)
-                               [[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-                               dosym ../$(get_abi_LIBDIR ppc)/ld.so.1 /lib/ld.so.1
-                               ;;
+               amd64) abi32="x86" ldso="ld-linux.so.2" ;;
+               ppc64) abi32="ppc" ldso="ld.so.1" ;;
                esac
+               if [[ -n ${ldso} ]] ; then
+                       [[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+                       dosym ../$(get_abi_LIBDIR ${abi32})/${ldso} $(alt_prefix)/lib/${ldso}
+               fi
        fi
 
        #################################################################
@@ -99,7 +97,7 @@ toolchain-glibc_src_install() {
                cd "${D}"$(alt_usrlibdir)/..
                [[ -e lib ]] || mkdir lib
 
-               dosym usr/include /usr/${CTARGET}/sys-include
+               dosym usr/include $(alt_prefix)/sys-include
                return 0
        fi