summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-01-16 07:56:56 +0000
committerMike Frysinger <vapier@gentoo.org>2012-01-16 07:56:56 +0000
commit4e9eff50b0a185a15d79481a4d860e2c177f7589 (patch)
treeaf292bdaeabe9947c566a30bde8c21f6dc72acf4 /sys-libs
parentRemove Emacs-23-CEDET-grammars from FSF-APPROVED since it's no longer used. (diff)
downloadgentoo-2-4e9eff50b0a185a15d79481a4d860e2c177f7589.tar.gz
gentoo-2-4e9eff50b0a185a15d79481a4d860e2c177f7589.tar.bz2
gentoo-2-4e9eff50b0a185a15d79481a4d860e2c177f7589.zip
Update x32 patchset #398895 by Chris Smith.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog5
-rw-r--r--sys-libs/glibc/glibc-2.15.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index cf741977208b..1b7d8376d163 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.817 2012/01/15 01:19:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.818 2012/01/16 07:56:56 vapier Exp $
+
+ 16 Jan 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15.ebuild:
+ Update x32 patchset #398895 by Chris Smith.
15 Jan 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15.ebuild:
Post some fixes from upstrea/suse.
diff --git a/sys-libs/glibc/glibc-2.15.ebuild b/sys-libs/glibc/glibc-2.15.ebuild
index 24c0ab7ddd3d..be463a2d90bf 100644
--- a/sys-libs/glibc/glibc-2.15.ebuild
+++ b/sys-libs/glibc/glibc-2.15.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.ebuild,v 1.2 2012/01/15 01:19:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.3 2012/01/16 07:56:56 vapier Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -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="2" # Gentoo patchset
+PATCH_VER="3" # Gentoo patchset
PORTS_VER=${RELEASE_VER} # version of glibc ports addon
LT_VER="" # version of linuxthreads addon
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires
@@ -195,7 +195,7 @@ done
eblit-src_unpack-pre() {
case ${CHOST} in
x86_64*)
- has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-2.14.1-x32.patch"
+ has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
;;
esac
}