diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-06-03 08:58:19 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-06-03 08:58:19 +0000 |
| commit | 4c490827cb8e4b67d8e8b70a9b398e9728b3eab4 (patch) | |
| tree | 0a3f490479151296462723919319389a0d819624 /sys-libs/glibc | |
| parent | Mention 2.x in DESCRIPTION since we have 3.x now too (diff) | |
| download | gentoo-2-4c490827cb8e4b67d8e8b70a9b398e9728b3eab4.tar.gz gentoo-2-4c490827cb8e4b67d8e8b70a9b398e9728b3eab4.tar.bz2 gentoo-2-4c490827cb8e4b67d8e8b70a9b398e9728b3eab4.zip | |
Update x32 patchset.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.15-r2.ebuild | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 7c9ff42ce475..dfa7c5182ad4 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,9 @@ # 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.856 2012/06/01 18:03:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.857 2012/06/03 08:58:19 vapier Exp $ + + 03 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15-r2.ebuild: + Update x32 patchset. 01 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.14.1-r2.ebuild, glibc-2.14.1-r3.ebuild, glibc-2.14.ebuild, glibc-2.15-r1.ebuild, diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild index 31c23dee18ec..822c79860594 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.4 2012/06/01 18:03:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.5 2012/06/03 08:58:19 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker @@ -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="14" # Gentoo patchset +PATCH_VER="15" # 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 @@ -177,7 +177,11 @@ for x in setup {pre,post}inst ; do done eblit-src_unpack-pre() { - GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" + 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" + fi } eblit-src_unpack-post() { |