diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-03-23 17:39:06 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-03-23 17:39:06 +0000 |
| commit | be760f6809b06dfb9124fe1e59a89877aa545d90 (patch) | |
| tree | f4d0803c358d15ab8b9312a33ec3dfc64aec2d7b /sys-libs | |
| parent | Remove warnings about devfs-compatible rules from the live ebuild (diff) | |
| download | gentoo-2-be760f6809b06dfb9124fe1e59a89877aa545d90.tar.gz gentoo-2-be760f6809b06dfb9124fe1e59a89877aa545d90.tar.bz2 gentoo-2-be760f6809b06dfb9124fe1e59a89877aa545d90.zip | |
Make sure we disable the x32 patch for non-x86_64 targets too.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.14.1-r1.ebuild | 9 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.14.1-r2.ebuild | 9 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.15.ebuild | 9 |
4 files changed, 14 insertions, 19 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 7d60109c74b0..13b9197ad402 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # 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.824 2012/03/23 03:08:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.825 2012/03/23 17:39:06 vapier Exp $ + + 23 Mar 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.14.1-r1.ebuild, + glibc-2.14.1-r2.ebuild, glibc-2.15.ebuild: + Make sure we disable the x32 patch for non-x86_64 targets too. 23 Mar 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15.ebuild: Update hashes to match official release tarballs. diff --git a/sys-libs/glibc/glibc-2.14.1-r1.ebuild b/sys-libs/glibc/glibc-2.14.1-r1.ebuild index 31ef5606dadf..6cfbdd9425f1 100644 --- a/sys-libs/glibc/glibc-2.14.1-r1.ebuild +++ b/sys-libs/glibc/glibc-2.14.1-r1.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.14.1-r1.ebuild,v 1.3 2012/01/17 23:51:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r1.ebuild,v 1.4 2012/03/23 17:39:06 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -205,11 +205,8 @@ pkg_setup() { } 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" - ;; - esac + [[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \ + || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" } eblit-src_unpack-post() { diff --git a/sys-libs/glibc/glibc-2.14.1-r2.ebuild b/sys-libs/glibc/glibc-2.14.1-r2.ebuild index cac6a94ae4a3..8b67e74498fa 100644 --- a/sys-libs/glibc/glibc-2.14.1-r2.ebuild +++ b/sys-libs/glibc/glibc-2.14.1-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.14.1-r2.ebuild,v 1.4 2012/02/16 02:59:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.5 2012/03/23 17:39:06 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -205,11 +205,8 @@ pkg_setup() { } 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" - ;; - esac + [[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \ + || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" } eblit-src_unpack-post() { diff --git a/sys-libs/glibc/glibc-2.15.ebuild b/sys-libs/glibc/glibc-2.15.ebuild index 14ea6a76cf61..d64297456910 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.8 2012/03/23 03:08:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.9 2012/03/23 17:39:06 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker @@ -191,11 +191,8 @@ for x in setup {pre,post}inst ; do done eblit-src_unpack-pre() { - case ${CHOST} in - x86_64*) - has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" - ;; - esac + [[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \ + || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" } eblit-src_unpack-post() { |