diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-08-24 08:16:38 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-08-24 08:16:38 +0000 |
| commit | c39bd4ba7a7c25eedc6be91d94e6881295402e33 (patch) | |
| tree | 66aac7da18edb0397be122b138631147fab2c4b4 /app-editors/emacs | |
| parent | Mergedlib fixed up again. (diff) | |
| download | gentoo-2-c39bd4ba7a7c25eedc6be91d94e6881295402e33.tar.gz gentoo-2-c39bd4ba7a7c25eedc6be91d94e6881295402e33.tar.bz2 gentoo-2-c39bd4ba7a7c25eedc6be91d94e6881295402e33.zip | |
Support x32 ABI on amd64.
(Portage version: 2.1.11.11/cvs/Linux x86_64)
Diffstat (limited to 'app-editors/emacs')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 15 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-18.59-r8.ebuild | 17 |
2 files changed, 19 insertions, 13 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index fd4e447231e6..a487e206209b 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,11 +1,12 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.520 2012/08/23 21:04:50 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.521 2012/08/24 08:16:38 ulm Exp $ - 23 Aug 2012; Markus Meier <maekke@gentoo.org> emacs-24.1-r1.ebuild: - arm stable, bug #431178 + 24 Aug 2012; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild: + Support x32 ABI on amd64. - 23 Aug 2012; Markus Meier <maekke@gentoo.org> emacs-23.4-r4.ebuild: + 23 Aug 2012; Markus Meier <maekke@gentoo.org> emacs-23.4-r4.ebuild, + emacs-24.1-r1.ebuild: arm stable, bug #431178 21 Aug 2012; Johannes Huber <johu@gentoo.org> emacs-23.4-r4.ebuild, @@ -21,10 +22,8 @@ emacs-24.1-r1.ebuild: Stable for HPPA (bug #431178). - 14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> emacs-24.1-r1.ebuild: - Stable for amd64, wrt bug #431178 - - 14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r4.ebuild: + 14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r4.ebuild, + emacs-24.1-r1.ebuild: Stable for amd64, wrt bug #431178 *emacs-24.1-r1 (13 Aug 2012) diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild index d2b5027cb970..7feda40be41b 100644 --- a/app-editors/emacs/emacs-18.59-r8.ebuild +++ b/app-editors/emacs/emacs-18.59-r8.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/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.5 2012/05/19 15:58:11 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.6 2012/08/24 08:16:38 ulm Exp $ EAPI=4 @@ -10,7 +10,7 @@ DESCRIPTION="The extensible self-documenting text editor" HOMEPAGE="http://www.gnu.org/software/emacs/" SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz - mirror://gentoo/${P}-patches-7.tar.bz2" + mirror://gentoo/${P}-patches-8.tar.bz2" LICENSE="GPL-1 GPL-2 BSD" #as-is SLOT="18" @@ -32,9 +32,16 @@ src_configure() { # autoconf? What's autoconf? We are living in 1992. ;-) local arch case ${ARCH} in - amd64) arch=intel386; multilib_toolchain_setup x86 ;; - x86) arch=intel386 ;; - *) die "Architecture ${ARCH} not yet supported" ;; + amd64) + if [[ ${DEFAULT_ABI} = x32 ]]; then + arch=x86-x32 + multilib_toolchain_setup x32 + else + arch=intel386 + multilib_toolchain_setup x86 + fi ;; + x86) arch=intel386 ;; + *) die "Architecture ${ARCH} not yet supported" ;; esac local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/" #use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/" |