diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-03-18 20:25:03 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-18 20:25:03 +0000 |
commit | 44b52448e8a153ddba719ed538de4b7e8c37b1d9 (patch) | |
tree | a12d78275c1f5752ee096ce41e344e94e7b4128d /sys-libs | |
parent | Stick the ABI flags into CC so that they are used at all steps -- compiler, a... (diff) | |
download | historical-44b52448e8a153ddba719ed538de4b7e8c37b1d9.tar.gz historical-44b52448e8a153ddba719ed538de4b7e8c37b1d9.tar.bz2 historical-44b52448e8a153ddba719ed538de4b7e8c37b1d9.zip |
Only generate /lib symlinks when SYMLINK_LIB is used.
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/glibc/Manifest | 12 | ||||
-rw-r--r-- | sys-libs/glibc/files/eblits/src_install.eblit | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index b7548bb3756a..d6470939160c 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # 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.760 2011/03/18 20:24:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.761 2011/03/18 20:25:03 vapier Exp $ + + 18 Mar 2011; Mike Frysinger <vapier@gentoo.org> + files/eblits/src_install.eblit: + Only generate /lib symlinks when SYMLINK_LIB is used. 18 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit: Stick the ABI flags into CC so that they are used at all steps -- compiler, diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 900cca31ff75..b92af7083c14 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -15,7 +15,7 @@ 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 9042 RMD160 da37fec1de02056b30a8a212659a6862fae21501 SHA1 bf98624870084acbefb5b2c89c69fc8cd3de5136 SHA256 2f6afd5fb4b8d865127063073ef2c9f2f01070113494cf5af734ba5b5ac4b3ad +AUX eblits/common.eblit 9183 RMD160 2c9dcbfe4560eba0e8d13535ea48bd9bb898d42c SHA1 7f8fa4fe4cfd66c774e65c60086b16b43484a974 SHA256 ae35d9efb733cf8c0d161a8a422189bc79e4ddf4d1cb62097c9059e192fd16f5 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 3086 RMD160 24a50d7a2c5e824e83573e9b69eb47cb0f4b225f SHA1 33624942a8a828fc3328bd1e61a8da2f00f56e61 SHA256 7b25d97376e2da04c6f94a0bfd8a94dcf32f4ce0a524677548d240a6abbc6d6d @@ -23,7 +23,7 @@ AUX eblits/src_compile-2.11.2.eblit 5904 RMD160 91b8119c650157afb633cf0de4e58138 AUX eblits/src_compile.eblit 5844 RMD160 29faae79a18f157e1412d527380c7b70cf7d2442 SHA1 7be66723d4b8af71dfda1bcd0308791acbdbf12e SHA256 29673cef6619ca56bc9ce8eaf8c1a995857626f6bcd72251c5a339ad0574c6fd AUX eblits/src_install-2.11.2.eblit 7774 RMD160 899189807a292cf7fc115e2146340c4a8de0fb10 SHA1 8371f6f35234eff1c6729208c36ac7aba220784b SHA256 df5051455fbd2681a698cc21dae8f08349fe230f42054c309a431c9e38489662 AUX eblits/src_install-2.6.eblit 7785 RMD160 29e196b3e3669e99257588f2da40bda20e3b689e SHA1 d3a7b22e219c2be3e8fd4345332a28e22dd24172 SHA256 3c48efe7ce590aa0ccfef4028dc77e47526227e715a38441e781c29a4b5eac56 -AUX eblits/src_install.eblit 7721 RMD160 cca612babbdb38ddb22a9f136e8640e3a8aa02cc SHA1 a4b00e99cb5b324767a754b5b7daf1fae9e23b3e SHA256 d73c5d8cd06ed2f9c03259e7612885591d1e1ee1c6c680a01996cbbd8f14d2bd +AUX eblits/src_install.eblit 7754 RMD160 6817600faa42b60f8ad1f33caabac0268450d53b SHA1 46c3ce7cf07c3c0814ec420535f4079d2091510a SHA256 da5b795d0e2c13ef8cd9b3c5a9aa4e3093d07e8b9a092fbf9c8a1e130d0b1101 AUX eblits/src_test-2.11.2.eblit 1169 RMD160 d7d1f430453e5278c2f3d4ee4815faff3a47a03a SHA1 9d48060c34ef901cbe6e8d7880ea923c8e1b7f28 SHA256 95b14845a80a74abc5b5c5146f2291524d7dd66f8e1bd9d12b42a3234a065010 AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727 AUX eblits/src_unpack.eblit 5631 RMD160 ff841c2b06e2896dd178d5795da0cd9da2f1aa01 SHA1 b2cbf59f27e55aa0d6ae5c0b3d1cc766df6866c5 SHA256 98c5e9c71f0c3529260cf538cf5935e5b58955cd0b9a721fe90abb661921a5b4 @@ -83,12 +83,12 @@ EBUILD glibc-2.7-r2.ebuild 12941 RMD160 461ae1f64ad710426a485eb5593f1e13c4a618d8 EBUILD glibc-2.8_p20080602-r1.ebuild 13488 RMD160 6b58dc46eb346a67557e5ce6b84a10a3688d649a SHA1 a89f61f4add7950715fedd27a4cc9fb68599f4c1 SHA256 f560d233bb3b0bcdda61fe6d052f54c253d43c9b31f7a2070e9b2f4003131b30 EBUILD glibc-2.9_p20081201-r2.ebuild 7772 RMD160 ad3a0203d514fea907712ada8a9c3970267aa823 SHA1 690094c7a7b7c5a0b016f41ba519d4ecaa8a1cea SHA256 bb909d9117328ca426af80e6b6d78cb3a96b0efe03d511ead4bf8d62341f42a2 EBUILD glibc-2.9_p20081201-r3.ebuild 7806 RMD160 6d696692a2e122bfdc149aea75368cea00bce92c SHA1 0df0da8ccd0a95084f849bdb92bfc3389efba74f SHA256 995c0e939cc7146e347d3f8caafbf4ad720a7caa7dfd0a9562f5a2877533a45c -MISC ChangeLog 136508 RMD160 8a39e8c3f1483c4580e3cb3d35276d9542a42ebb SHA1 ad184b577e4e69efe6596de6e462138b8ec2f826 SHA256 ed8626d928d73f5409f7845508e7401dcd84f3156ce66836a791ddde599e1c5e +MISC ChangeLog 136827 RMD160 0f504848691a0d9edde44b9a4b68bebe79ae053f SHA1 67d80c1b8abdf21265e0b84205e1bf93e3fcebc8 SHA256 86a6b6fc1e286c646b61b724e6832d13dffff2acd24db424041d2a455c00220f MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk153tMACgkQaC/OocHi7JaK1QEAmfQo0T6zpW8vo672q/0n1nQX -Wjq096ZAtN4aMJixw/0A/ApHPEcpWmcUESwjREF5lx0wZHQuY/Pie7FUIeuvsHPU -=xWfV +iF4EAREIAAYFAk2Dv6QACgkQaC/OocHi7JaAcAD/dB/x87aML+kghF5lXnXYJ3zR +dgMkLLLLXkriUdjuOMIA/As9c1odBlE2qTag+5GHCcwYZZyMju1TdCqFVXnBDVyO +=RxuO -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index 12c757778711..a134e5618f17 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.13 2011/03/11 02:40:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.14 2011/03/18 20:25:03 vapier Exp $ toolchain-glibc_src_install() { local GBUILDDIR @@ -98,7 +98,7 @@ toolchain-glibc_src_install() { is_final_abi || return 0 # Make sure the non-native interp can be found on multilib systems - if has_multilib_profile ; then + if [[ ${SYMLINK_LIB} == "yes" ]] && has_multilib_profile ; then case $(tc-arch) in amd64) [[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR amd64) /lib |