diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-06-14 18:31:21 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-06-14 18:31:21 +0000 |
| commit | 7b7d223ba6ba4868d6b2a1d3c17bebe63597a57a (patch) | |
| tree | 9e1fa43003581ea45419131aa3d808dff903080d /sys-libs | |
| parent | [bump] dev-perl/JSON-RPC-1.20.0 (diff) | |
| download | gentoo-2-7b7d223ba6ba4868d6b2a1d3c17bebe63597a57a.tar.gz gentoo-2-7b7d223ba6ba4868d6b2a1d3c17bebe63597a57a.tar.bz2 gentoo-2-7b7d223ba6ba4868d6b2a1d3c17bebe63597a57a.zip | |
Fix from upstream to for strtok on x32 #420951.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.15-r2.ebuild | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 71fa72289ed7..01f4d0d63e39 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,5 +1,8 @@ -# ChangeLog for sys-libs/glibc# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.859 2012/06/13 17:15:47 vapier Exp $ +# ChangeLog for sys-libs/glibc +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.860 2012/06/14 18:31:21 vapier Exp $ + + 14 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15-r2.ebuild: + Fix from upstream to for strtok on x32 #420951. 13 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15-r2.ebuild: Fix from upstream for warnings with fortify and FD_SET. diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild index 04a783f406c3..2bdb346e0eb2 100644 --- a/sys-libs/glibc/glibc-2.15-r2.ebuild +++ b/sys-libs/glibc/glibc-2.15-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.7 2012/06/13 17:15:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.8 2012/06/14 18:31:21 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing @@ -33,7 +33,7 @@ esac MANPAGE_VER="" # pregenerated manpages INFOPAGE_VER="" # pregenerated infopages LIBIDN_VER="" # it's integrated into the main tarball now -PATCH_VER="16" # Gentoo patchset +PATCH_VER="17" # Gentoo patchset PORTS_VER=${RELEASE_VER} # version of glibc ports addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires @@ -180,7 +180,7 @@ eblit-src_unpack-pre() { if [[ ${CTARGET} == x86_64* ]] && has x32 $(get_all_abis) ; then GLIBC_PATCH_EXCLUDE+=" 0080_all_glibc-2.15-revert-x86_64-eagain-pthread_cond_wait.patch" else - GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" + GLIBC_PATCH_EXCLUDE+=" 120?_all_glibc-${PV}-x32*.patch" fi } |