diff options
author | Ulrich Müller <ulm@gentoo.org> | 2012-06-29 07:28:30 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2012-06-29 07:28:30 +0000 |
commit | 73fd7bbf166a1ed41e85dac8d3dcfc4b0c560c69 (patch) | |
tree | a55c9f305984663acc530565b76ebfa2977630bc | |
parent | Copied from Portage tree. (diff) | |
download | emacs-73fd7bbf166a1ed41e85dac8d3dcfc4b0c560c69.tar.gz emacs-73fd7bbf166a1ed41e85dac8d3dcfc4b0c560c69.tar.bz2 emacs-73fd7bbf166a1ed41e85dac8d3dcfc4b0c560c69.zip |
Preliminary support for x32 ABI on amd64.
svn path=/emacs-overlay/; revision=1816
-rw-r--r-- | app-editors/emacs/ChangeLog | 3 | ||||
-rw-r--r-- | app-editors/emacs/Manifest | 32 | ||||
-rw-r--r-- | app-editors/emacs/emacs-18.59-r8.ebuild | 15 |
3 files changed, 30 insertions, 20 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 91b023f..7d1cb2d 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Jun 2012; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild: + Preliminary support for x32 ABI on amd64. + *emacs-18.59-r8 (29 Jun 2012) 29 Jun 2012; Ulrich Müller <ulm@gentoo.org> +emacs-18.59-r8.ebuild, diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 7558e20..f6d7749 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -2,25 +2,25 @@ Hash: SHA1 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd -DIST emacs-18.59-patches-7.tar.bz2 19400 RMD160 72588ffa6b625a775b42d5898eccb43932ff67f9 SHA1 d7d0e16ea7896f5fcde877b68dcd6be032b00beb SHA256 e96d63ae61bbded28b25d1bff6ec9a7e732f870f9f71152200bcb35658ef2f21 +DIST emacs-18.59-patches-8.tar.bz2 19667 RMD160 34e90078160356b5a2c6041d63b53d9cbeb3809c SHA1 2a474268c2a4c2582ce881c4a4ccb799eb5f5b7f SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e -EBUILD emacs-18.59-r8.ebuild 4264 RMD160 af8c58f732c2393293f2d94a066f42f30e51b3c2 SHA1 5bf01800fee2cf9c4b8c8b0bd44dccb0d343677b SHA256 5fed7b929bb27f92a89d1165cb46da01381b9bade3a2c4191ca483303dd5089d -MISC ChangeLog 266 RMD160 58ad360e8e21d8c8127b5fcb10afec6fcd9a0a3b SHA1 64afe01a26594fe721f804a0b46a3ed22205d3e1 SHA256 04c5649a1586b2b8c765adf3f0701200b98f53f2b6e47a9f6a13763c7e5cf76b +EBUILD emacs-18.59-r8.ebuild 4386 RMD160 e3e69bdc8ac3c1cbcce7f805993cabeff9bf38ac SHA1 11cc3f280f600316d523447631590e2c2d2b95f7 SHA256 177724c7f30d86026a2ac7ef70ea3cb45eb9bb7ac0b9ce46f8bd502cb0568b61 +MISC ChangeLog 381 RMD160 be29a8500c6ecfe53ad640d7c5ff50d259c4da27 SHA1 3d4076f5798298b0133a97b7a34dc4993c53bdd9 SHA256 d29246291ed7ae2fe07e3d67aba37ea179b1222ee70518a341349f4d35bd01da MISC metadata.xml 1058 RMD160 d3e8052955c150db48abeff58d2842683e70adca SHA1 8b9d69821063ca72c47cfa18fa11d566e3d26b68 SHA256 dda96db4208b0d9b4466b22166988c5d9c1f4dd577f05d94170f6a297a4d564e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBAgAGBQJP7VnxAAoJEDxpGckxwJCBUg4QAKUn1FG3vToEz3pYH8m5q3RK -S2+oJasCBHRuQEsOPIB9j+PuutpHt3EW1bZNkGpPo0GZdFxSYhcqtuzVvC6rwms0 -ScnxkJsCpRHy8gbJSVOHtegOM9E0xyYab6fTOF1hq04EUCWEANbaOJLSLOwN1K3p -+A3GlJ4/dVgN5R5a0X7uoYnDROz3rfrFCXDzskIEgiKMqd0xygM3eMJgLomFRxaf -mfmZ/g9jIHVe1g4o5DUm8TKZfX4vm3JyiLziNRjED/e9HGPdyi+jPb/6UZocpy27 -mKfcG2We4JepfB99Q0MIXgWXoQ4qyUf0MTattwFHoMe3lmLo5khmJA2SBxNW8TQS -+366wqbuc/OMZWgF8n6q29os/g02hewtPQEexOwcYShnYTRGR4HSUUOWOhFi1Ho5 -ydzYZ5BJWcfc8nPM/3O+2jRN9DlNg0OQ69VUEAew0rIzJ4i6UVZnOVTKjLZ98Tem -lhoo1BBzDWOSc831UNpKGsH33ksA5nQZ976gZTg7K3rWXgjStBoDy1yk3zPr1m7n -gOf+9r2FEmxGm6ZTxROpkeJI6ka+4BBYXkE1vD30SEsTupjaxkI7g9G9GInfz0N4 -5g4QyF5wK8w8YNTqPnB/kqd75hxRgBZqQG3xFSgjDhten9983I48NME9pYkxFaVX -cgRsi9an2X2ER1fLPntL -=q+vl +iQIcBAEBAgAGBQJP7VpcAAoJEDxpGckxwJCBxvAQAMNaLtrCTj+cPKwlNqKE1+TZ +QtCZF+Fo5QWVUjGgRwj1+ETdYW4G3EDX/yEfEnoAMdBm4AlN7OguJjISIvlDwvpl +3ZHa8W4T08GEINa/tSrfq8O0sn/rIiBdxI92nMDzi5NKbypt4xVwvpy7t3GtFjII +PemVucOFcRtMKLlm+Oe+eho/Q/GrFOhxtLUorTzM1QiYAFYO6jwge9INLV+XnMpx +9/7aPJjd8jpCXNEZs55ZNvqzYkG6CYKGs11pRG2yi7GShuCZRFbxhnY4iFrkhsBA +NWwGoulMHd9HkyAIxDUTVnvBivSfdj8qWK2O03IIo5w3SukTHzstlZkq709uXOxT +WLT5oKbfBUjhSemf+1h6zcyjO8u3zIt0cOUE9bgyaXYPgp/G8Dcvi/c+teJrfKA4 +TVzylOs3v/Ekry16w83gB/DkYH7jfbj3elN5TNdAE+Pl8hApEto2AYSphB9UwwGd +iBKf5d+xCXHRC+m9rVXFYUWdD219+Vy/4aCsbRQzYc87xdhCiSoLybgAixMWy3s2 +buOLS23FN8GWSaTXpst3B5l4Ec7iiPF27S1oELXrLRh72P7aerQ/e4wFW4Sbr+sw +9ksvRHNPkpRIbgkt9nO478tV9cP0VEvRfqjX/2lQeGGt9vWpATNarSJi7FfCQ2g3 +qP8QzMm7jzUjpaAjAZ7d +=/LoX -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild index 8dd23a5..f522a7d 100644 --- a/app-editors/emacs/emacs-18.59-r8.ebuild +++ b/app-editors/emacs/emacs-18.59-r8.ebuild @@ -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" + http://dev.gentoo.org/~ulm/emacs/${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/" |