commit: 2e7218d91a50cb6acb3f31f86a0ccf2abf3a1042
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 16:27:25 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 16:34:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e7218d9
sys-libs/glibc: version bump to 2.23
sys-libs/glibc/Manifest | 2 ++
.../glibc/{glibc-9999.ebuild => glibc-2.23.ebuild} | 19 ++++++++++++++++---
sys-libs/glibc/glibc-9999.ebuild | 4 ++--
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 4d393b3..379656c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -13,3 +13,5 @@ DIST glibc-2.21.tar.xz 12322092 SHA256
aeeb362437965a5d3f40b151094ca79def04a115b
DIST glibc-2.22-patches-10.tar.bz2 54312 SHA256
0cf9935301d2cf427e35c7b3866dd0036e0ec473ba5ff1cf6684c424ed5638aa SHA512
ebb4230705e61675ec0d70ad66816956479bd3ab7c20a3d970ba18d01b79de73e202cafe361c7f509cbfbc89bd99b19f75d5d3f3b9bb46d6f1fba6851ae0bf44
WHIRLPOOL
4fc98a7572070f1556410b8d20d078557a9786720d6a3425e2d924e6f86448810433911a4b3df2b8022f46e8b8e475f61bad12528efc988516422b89aee7e2cc
DIST glibc-2.22-patches-9.tar.bz2 37781 SHA256
724ebd9c068af2740b2058dfe6685e4c496c845a9e927efdacd763c22d5d9fbd SHA512
dda6ce3908f4261744178c0a345c016a3b0a7ca1d75063e1b216b6b95aea663f1741391e71966e0ed8018eea1a628786ccd026c6616def721bbedb961d5245e8
WHIRLPOOL
9725fabb933d3b48cdce5df4e5e9ed9bc58f737836405e1345849764ae6013cd2a2ac73a23137e87964d940bd79115f82b777bc807ce4c58a28a247cdf22f68f
DIST glibc-2.22.tar.xz 12969072 SHA256
eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 SHA512
a8719f3a4f8aa5fa81711116fdafbea5082c6dfd85bd8c4cdce60571910263ab422b35bb8b55a84d37ccb146442133ba60a84d453ca4a439c8ccd35419bd051b
WHIRLPOOL
f7e707b3776fc197a2e7bf5633721925507237b154bbc1f94b9fc303c87e6fc039ff0758da6ee55b4c1a0daaa87c6e594a6c96e7b00a7ba8ae98ee29918709a7
+DIST glibc-2.23-patches-1.tar.bz2 209934 SHA256
381b378542046e5570d11e70d985b4bcc961a5b64d5ff77a27e90035e21200a4 SHA512
285941d993dee962d43f42ade4d8f8d7f6e2bdaa0e428831155666d58c219ddffeef6dc9e3836936453595cc4389521827e9200e4465d78fe92d9588d8d12c33
WHIRLPOOL
f1a9b269959c5c00cdade8673b006d1f087d026bf42fae48cb1dd072d17a3678babc078e88d259d01c3e38c8c483415f6016c37b6c88dc80357e08a2a8e30f26
+DIST glibc-2.23.tar.xz 13455260 SHA256
94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 SHA512
b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf
WHIRLPOOL
7c7e3bf55a89a04bac917b9ca5a1cbb1613f22c427d2766f114b5a36f9635856005b823852ef5d3b73462b577fe4e5865e68e7b64633d48a95fa1e5eaa831a71
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-2.23.ebuild
similarity index 88%
copy from sys-libs/glibc/glibc-9999.ebuild
copy to sys-libs/glibc/glibc-2.23.ebuild
index f4c4b14..919748f 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-2.23.ebuild
@@ -27,7 +27,7 @@ case ${PV} in
;;
esac
GCC_BOOTSTRAP_VER="4.7.3-r1"
-PATCH_VER="" # Gentoo patchset
+PATCH_VER="1" # Gentoo patchset
: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl
requires
IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla
crosscompile_opts_headers-only"
@@ -76,13 +76,13 @@ RDEPEND="!sys-kernel/ps3-sources
if [[ ${CATEGORY} == cross-* ]] ; then
DEPEND+=" !crosscompile_opts_headers-only? (
>=${CATEGORY}/binutils-2.24
- >=${CATEGORY}/gcc-4.6
+ >=${CATEGORY}/gcc-4.7
)"
[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
else
DEPEND+="
>=sys-devel/binutils-2.24
- >=sys-devel/gcc-4.6
+ >=sys-devel/gcc-4.7
virtual/os-headers"
RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
@@ -155,11 +155,16 @@ done
eblit-src_unpack-pre() {
[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack
gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
+ # Bug 558636 we don't apply the pie works around for 2.22. It shoud
have the support. #558636
+ GLIBC_PATCH_EXCLUDE+="
00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
+ GLIBC_PATCH_EXCLUDE+="
00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
}
eblit-src_prepare-post() {
cd "${S}"
+ epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch
#503838
+
if use hardened ; then
# We don't enable these for non-hardened as the output is very
terse --
# it only states that a crash happened. The default upstream
behavior
@@ -181,4 +186,12 @@ eblit-src_prepare-post() {
-e 's:-fstack-protector$:-fstack-protector-all:' \
*/Makefile || die
fi
+
+ case $(gcc-fullversion) in
+ 4.8.[0-3]|4.9.0)
+ eerror "You need to switch to a newer compiler; gcc-4.8.[0-3]
and gcc-4.9.0 miscompile"
+ eerror "glibc. See https://bugs.gentoo.org/547420 for details."
+ die "need to switch compilers #547420"
+ ;;
+ esac
}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index f4c4b14..d2b9c01 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -76,13 +76,13 @@ RDEPEND="!sys-kernel/ps3-sources
if [[ ${CATEGORY} == cross-* ]] ; then
DEPEND+=" !crosscompile_opts_headers-only? (
>=${CATEGORY}/binutils-2.24
- >=${CATEGORY}/gcc-4.6
+ >=${CATEGORY}/gcc-4.7
)"
[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
else
DEPEND+="
>=sys-devel/binutils-2.24
- >=sys-devel/gcc-4.6
+ >=sys-devel/gcc-4.7
virtual/os-headers"
RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
