| 1 |
ulm 12/08/24 08:16:39 |
| 2 |
|
| 3 |
Modified: ChangeLog emacs-18.59-r8.ebuild |
| 4 |
Log: |
| 5 |
Support x32 ABI on amd64. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.521 app-editors/emacs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.521&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.521&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.520&r2=1.521 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
| 19 |
retrieving revision 1.520 |
| 20 |
retrieving revision 1.521 |
| 21 |
diff -u -r1.520 -r1.521 |
| 22 |
--- ChangeLog 23 Aug 2012 21:04:50 -0000 1.520 |
| 23 |
+++ ChangeLog 24 Aug 2012 08:16:38 -0000 1.521 |
| 24 |
@@ -1,11 +1,12 @@ |
| 25 |
# ChangeLog for app-editors/emacs |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.520 2012/08/23 21:04:50 maekke Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.521 2012/08/24 08:16:38 ulm Exp $ |
| 29 |
|
| 30 |
- 23 Aug 2012; Markus Meier <maekke@g.o> emacs-24.1-r1.ebuild: |
| 31 |
- arm stable, bug #431178 |
| 32 |
+ 24 Aug 2012; Ulrich Müller <ulm@g.o> emacs-18.59-r8.ebuild: |
| 33 |
+ Support x32 ABI on amd64. |
| 34 |
|
| 35 |
- 23 Aug 2012; Markus Meier <maekke@g.o> emacs-23.4-r4.ebuild: |
| 36 |
+ 23 Aug 2012; Markus Meier <maekke@g.o> emacs-23.4-r4.ebuild, |
| 37 |
+ emacs-24.1-r1.ebuild: |
| 38 |
arm stable, bug #431178 |
| 39 |
|
| 40 |
21 Aug 2012; Johannes Huber <johu@g.o> emacs-23.4-r4.ebuild, |
| 41 |
@@ -21,10 +22,8 @@ |
| 42 |
emacs-24.1-r1.ebuild: |
| 43 |
Stable for HPPA (bug #431178). |
| 44 |
|
| 45 |
- 14 Aug 2012; Agostino Sarubbo <ago@g.o> emacs-24.1-r1.ebuild: |
| 46 |
- Stable for amd64, wrt bug #431178 |
| 47 |
- |
| 48 |
- 14 Aug 2012; Agostino Sarubbo <ago@g.o> emacs-23.4-r4.ebuild: |
| 49 |
+ 14 Aug 2012; Agostino Sarubbo <ago@g.o> emacs-23.4-r4.ebuild, |
| 50 |
+ emacs-24.1-r1.ebuild: |
| 51 |
Stable for amd64, wrt bug #431178 |
| 52 |
|
| 53 |
*emacs-24.1-r1 (13 Aug 2012) |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.6 app-editors/emacs/emacs-18.59-r8.ebuild |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.6&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.6&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.5&r2=1.6 |
| 62 |
|
| 63 |
Index: emacs-18.59-r8.ebuild |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v |
| 66 |
retrieving revision 1.5 |
| 67 |
retrieving revision 1.6 |
| 68 |
diff -u -r1.5 -r1.6 |
| 69 |
--- emacs-18.59-r8.ebuild 19 May 2012 15:58:11 -0000 1.5 |
| 70 |
+++ emacs-18.59-r8.ebuild 24 Aug 2012 08:16:38 -0000 1.6 |
| 71 |
@@ -1,6 +1,6 @@ |
| 72 |
# Copyright 1999-2012 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.5 2012/05/19 15:58:11 ulm Exp $ |
| 75 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.6 2012/08/24 08:16:38 ulm Exp $ |
| 76 |
|
| 77 |
EAPI=4 |
| 78 |
|
| 79 |
@@ -10,7 +10,7 @@ |
| 80 |
HOMEPAGE="http://www.gnu.org/software/emacs/" |
| 81 |
SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz |
| 82 |
ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz |
| 83 |
- mirror://gentoo/${P}-patches-7.tar.bz2" |
| 84 |
+ mirror://gentoo/${P}-patches-8.tar.bz2" |
| 85 |
|
| 86 |
LICENSE="GPL-1 GPL-2 BSD" #as-is |
| 87 |
SLOT="18" |
| 88 |
@@ -32,9 +32,16 @@ |
| 89 |
# autoconf? What's autoconf? We are living in 1992. ;-) |
| 90 |
local arch |
| 91 |
case ${ARCH} in |
| 92 |
- amd64) arch=intel386; multilib_toolchain_setup x86 ;; |
| 93 |
- x86) arch=intel386 ;; |
| 94 |
- *) die "Architecture ${ARCH} not yet supported" ;; |
| 95 |
+ amd64) |
| 96 |
+ if [[ ${DEFAULT_ABI} = x32 ]]; then |
| 97 |
+ arch=x86-x32 |
| 98 |
+ multilib_toolchain_setup x32 |
| 99 |
+ else |
| 100 |
+ arch=intel386 |
| 101 |
+ multilib_toolchain_setup x86 |
| 102 |
+ fi ;; |
| 103 |
+ x86) arch=intel386 ;; |
| 104 |
+ *) die "Architecture ${ARCH} not yet supported" ;; |
| 105 |
esac |
| 106 |
local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/" |
| 107 |
#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/" |
Archives