public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Mueller (ulm)" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild
Date: Fri, 24 Aug 2012 08:16:39 +0000 (UTC)	[thread overview]
Message-ID: <20120824081639.21D3A2055E@flycatcher.gentoo.org> (raw)

ulm         12/08/24 08:16:39

  Modified:             ChangeLog emacs-18.59-r8.ebuild
  Log:
  Support x32 ABI on amd64.
  
  (Portage version: 2.1.11.11/cvs/Linux x86_64)

Revision  Changes    Path
1.521                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.521&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.521&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.520&r2=1.521

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- ChangeLog	23 Aug 2012 21:04:50 -0000	1.520
+++ ChangeLog	24 Aug 2012 08:16:38 -0000	1.521
@@ -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)



1.6                  app-editors/emacs/emacs-18.59-r8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.5&r2=1.6

Index: emacs-18.59-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-18.59-r8.ebuild	19 May 2012 15:58:11 -0000	1.5
+++ emacs-18.59-r8.ebuild	24 Aug 2012 08:16:38 -0000	1.6
@@ -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 @@
 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 @@
 	# 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/"





             reply	other threads:[~2012-08-24  8:16 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-24  8:16 Ulrich Mueller (ulm) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-04-23 11:38 [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild Ulrich Mueller (ulm)
2014-03-29 11:56 Ulrich Mueller (ulm)
2013-08-21 21:07 Ulrich Mueller (ulm)
2013-08-06 10:54 Ulrich Mueller (ulm)
2013-08-03 22:56 Ulrich Mueller (ulm)
2013-03-18 23:13 Ulrich Mueller (ulm)
2012-01-04 17:30 PaweA Hajdan (phajdan.jr)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120824081639.21D3A2055E@flycatcher.gentoo.org \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox