summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-12-09 04:53:23 +0000
committerMike Frysinger <vapier@gentoo.org>2011-12-09 04:53:23 +0000
commita328a6bd5aab59ed0e9c8b28b5011aaccd2dce4a (patch)
treefb0e2f8674f0750e23b34117e19a718c98d04951 /sys-libs/glibc
parentVersion bump. (diff)
downloadhistorical-a328a6bd5aab59ed0e9c8b28b5011aaccd2dce4a.tar.gz
historical-a328a6bd5aab59ed0e9c8b28b5011aaccd2dce4a.tar.bz2
historical-a328a6bd5aab59ed0e9c8b28b5011aaccd2dce4a.zip
Symlink /lib to the default ABI, not to a hardcoded default.
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r--sys-libs/glibc/ChangeLog6
-rw-r--r--sys-libs/glibc/Manifest22
-rw-r--r--sys-libs/glibc/files/eblits/src_install.eblit6
3 files changed, 14 insertions, 20 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a55dc84f5072..ef1e96ab6a37 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.801 2011/12/04 16:27:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.802 2011/12/09 04:53:23 vapier Exp $
+
+ 09 Dec 2011; Mike Frysinger <vapier@gentoo.org>
+ files/eblits/src_install.eblit:
+ Symlink /lib to the default ABI, not to a hardcoded default.
04 Dec 2011; Markos Chandras <hwoarang@gentoo.org> glibc-2.13-r4.ebuild:
Stable on amd64 wrt bug #382377
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b48fcc0b325c..01ddbc328fbd 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX 2.10/glibc-2.10-gentoo-chk_fail.c 9407 RMD160 230701dfacfe2481eb49e5384fe4ebb508bd3af2 SHA1 0e9330d57de714dd1ecd7040d3eabf4723cdee7c SHA256 7745c0f5d37b37959b43b41e39762fc35b877161bc5740d9d3e9a83021acbc0e
AUX 2.10/glibc-2.10-hardened-configure-picdefault.patch 865 RMD160 744bdbfb73f1dbced4cb33cb5aa92f3b41d3b4fb SHA1 21e0f83598f5342032a794315f0e3dac07f647da SHA256 b50b29f85d88011555bbcbe6046e6600be9344f2d78412b14aebdea515420774
@@ -20,7 +20,7 @@ AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f
AUX eblits/pkg_preinst.eblit 3469 RMD160 a8f0831802ea5b5bec02b6379f08cd5f4f0ad27a SHA1 31a9a0815f11bd186c27d3cc44a394e4aee754be SHA256 7f947a83488dccd4c5169508d7c125d09fdd30ddd07d98b528ad12d83b9e2730
AUX eblits/pkg_setup.eblit 3146 RMD160 f0575822d5364b5167c17ea7b0aabd821b61fb19 SHA1 e5e55694c18a4c7b8df2e76586866894b018f04e SHA256 c4a59e35b3c5847fa24cc35fb4af4c190a057587453ac8c463244189ff627d74
AUX eblits/src_compile.eblit 6030 RMD160 07c1916050bac9c13e472ea5b4c7f08d2fc80787 SHA1 b09709b15f37f029bad44f6f48ed50b5bfe6ce7c SHA256 4efa7dc520bc3f015f99816717f9e781e81fbdff3cfc8e41baf7e637520b206f
-AUX eblits/src_install.eblit 7694 RMD160 6b228b485e8a743b9c2303b7dceb870bf009c98e SHA1 ddeb1b8ad2bdd18312d64dcb1ec979ddcf103b56 SHA256 9bb91c803f1392bf0926c1866c99cf234c983e30495810b99b58d2d8b18ea2bf
+AUX eblits/src_install.eblit 7712 RMD160 fa8276a921a9e16d2e1f5d39d0691f6b85162d98 SHA1 f217e1f2d53552e15506d6e1e1659f458168ef59 SHA256 8048ca748418e22faa6dbeb17eb35827170b3f8a196976dff32c29cfbb28cd67
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
@@ -62,22 +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 143047 RMD160 c9efb66c2871c2c519a1b51d4be00db6a702d88d SHA1 3c188488f8822b13267017e4ea4797a07baf6eda SHA256 f15874fabfd6a84255dcec94a0cc69f597f14fb00e05484ad987d4f238421b1f
+MISC ChangeLog 143193 RMD160 93bd420442c5ba7a5a3b390af23043b8ef58fd0f SHA1 4b72be8af66856292bb513d883b2c7573de92b6f SHA256 42cdea70c3958456cdecc1cfbe475b9727dd1fd704b5f01a6c7b584b65163ec5
MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCgAGBQJO25+HAAoJEPqDWhW0r/LCVvoP/RRAQ37ASgI7VHJL8+xCOeyI
-4R+NJ5HOUJD1rHSjK4/dsEJWTaCqC3G3cE2x+3ujtgiijSqivXb09mJnjL3LEZyR
-y/wv9x1NveuBCesflwfG4uqmKoL01/q1gPDHELRJnnPP+oCgY+EaP5NKS2/xASBZ
-DL6Ap5ldt+hdgrL/CatQRIiegT7ursdSYyvG5kFVZFSiQ4ucb9HM61MfrXcxZ/f5
-nMKTmDv2OAjfSQvB6nBQzaays6/ohn7igIHJYu0CmQXcDaGqz9brQ+RHpdkGBFvJ
-oMCqJnavISIvZh3eqYsEcsAaXFFWXToE/HrnrnhrcFjILqTfXFRBZFiBiqBHli4C
-bfe3HvdbFZTfflc7ScGVV221twBgxSuTlOLaHo4TjYq/+vtvbXaSgu4rRnXYzYjl
-y4gjD+wWKIsP94++41AI+nclXeaNq4BLcIylwEkYZlZtW9sf0dmYR+R3N/f8jNVd
-/+mWeKczh+vtL2485SbtYg5Hv3bd9SuXx4FPo3AxZfaW48OI2sMoGoPAMTEgewJW
-yml0WSjxa2wDkpPo96irDUjrZD2XjTIfdyA3qSI8/0kRkuweXNpJuxMNH4Gd34pG
-r33KddR6+dSltFIN0xwSdi8zXGo8TZNYPRsk3HR+Gn27PwzoObGi0JchZdeGNRZN
-DLGSB5FRPCdGDXNEX/Q3
-=v6V0
+iF4EAREIAAYFAk7hlFIACgkQaC/OocHi7Jb9hAEAn54PJpDZ/yiSQmjyaDDjNM9O
+NXIp/yIWq657D2PHX70A/0WEp0syqOrGeIsUZVSpIdaTkYkhIcXTWuuvAdlu4rHp
+=te1A
-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 4208d1039851..00680eaf2221 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.17 2011/11/16 16:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.18 2011/12/09 04:53:23 vapier Exp $
toolchain-glibc_src_install() {
local GBUILDDIR
@@ -80,11 +80,11 @@ toolchain-glibc_src_install() {
if [[ ${SYMLINK_LIB} == "yes" ]] && has_multilib_profile ; then
case $(tc-arch) in
amd64)
- [[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR amd64) /lib
+ [[ ! -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 ppc64) /lib
+ [[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
dosym ../$(get_abi_LIBDIR ppc)/ld.so.1 /lib/ld.so.1
;;
esac