diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-01-17 13:06:45 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-01-17 13:06:45 +0000 |
| commit | 9e71a9bcef326611e5071e8ba8ff8ca61b5e644f (patch) | |
| tree | 4a617c5a7cd8ba3f79f571fee8be2d2e419cca5a /app-editors | |
| parent | Fix gnupg DEPEND (diff) | |
| download | gentoo-2-9e71a9bcef326611e5071e8ba8ff8ca61b5e644f.tar.gz gentoo-2-9e71a9bcef326611e5071e8ba8ff8ca61b5e644f.tar.bz2 gentoo-2-9e71a9bcef326611e5071e8ba8ff8ca61b5e644f.zip | |
Replace s390x patch by upstream fix, bug 205555.
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch | 43 |
2 files changed, 29 insertions, 20 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 386986841c7a..619b8fba2c36 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.228 2008/01/13 09:48:47 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.229 2008/01/17 13:06:44 ulm Exp $ + + 17 Jan 2008; Ulrich Mueller <ulm@gentoo.org> + files/emacs-22.1-s390x-non-multilib.patch: + Replace s390x patch by upstream fix, bug 205555. 13 Jan 2008; Ulrich Mueller <ulm@gentoo.org> +files/emacs-22.1-s390x-non-multilib.patch, emacs-22.1-r3.ebuild: diff --git a/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch b/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch index 415b431951de..d444557f07cc 100644 --- a/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch +++ b/app-editors/emacs/files/emacs-22.1-s390x-non-multilib.patch @@ -1,27 +1,32 @@ ---- emacs-22.1-orig/src/Makefile.in 2007-03-21 15:31:24.000000000 +0100 -+++ emacs-22.1/src/Makefile.in 2008-01-13 03:53:26.000000000 +0100 -@@ -29,6 +29,9 @@ - - # Here are the things that we expect ../configure to edit. - # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ - srcdir=@srcdir@ - VPATH=@srcdir@ - CC=@CC@ ---- emacs-22.1-orig/src/m/ibms390x.h 2007-01-21 04:59:39.000000000 +0100 -+++ emacs-22.1/src/m/ibms390x.h 2008-01-13 03:51:46.000000000 +0100 -@@ -160,10 +160,10 @@ +--- configure.in 7 Jan 2008 08:53:18 -0000 1.444.2.6 ++++ configure.in 17 Jan 2008 04:04:51 -0000 1.444.2.7 +@@ -1532,7 +1532,7 @@ + ### The standard library on x86-64 GNU/Linux distributions can + ### be located in either /usr/lib64 or /usr/lib. + case "${canonical}" in +- x86_64-*-linux-gnu* ) ++ x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) + if test -d /usr/lib64; then + AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1, + [Define to 1 if the file /usr/lib64 exists.]) +--- src/m/ibms390x.h 8 Jan 2008 04:04:33 -0000 1.4.2.3 ++++ src/m/ibms390x.h 17 Jan 2008 04:03:58 -0000 1.4.2.4 +@@ -161,10 +161,18 @@ #define XPNTR(a) XUINT (a) #undef START_FILES --#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o -+#define START_FILES pre-crt0.o $(libdir)/crt1.o $(libdir)/crti.o ++#ifdef HAVE_X86_64_LIB64_DIR + #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o ++#else ++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o ++#endif #undef LIB_STANDARD --#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o -+#define LIB_STANDARD -lgcc -lc -lgcc $(libdir)/crtn.o ++#ifdef HAVE_X86_64_LIB64_DIR + #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o ++#else ++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o ++#endif /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519 (do not change this comment) */ |