aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/emacs
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-06-28 10:19:32 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-06-28 10:40:26 +0200
commitd96913bde21f95be327e5f7fc08aa2a1f0640c96 (patch)
tree636cc85e2eee3d8ef9478ff7165942aaf763cfc5 /recipes/emacs
parent4a112bf47fda68840d5aad80eb3992d97118b071 (diff)
downloadopenembedded-d96913bde21f95be327e5f7fc08aa2a1f0640c96.tar.gz
openembedded-d96913bde21f95be327e5f7fc08aa2a1f0640c96.tar.bz2
openembedded-d96913bde21f95be327e5f7fc08aa2a1f0640c96.zip
emacs-x11-23.1: add patch to build it with newer cpp
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/emacs')
-rw-r--r--recipes/emacs/emacs-x11-23.1/configure.in.lost.backslashes.patch24
-rw-r--r--recipes/emacs/emacs-x11_23.1.bb7
2 files changed, 28 insertions, 3 deletions
diff --git a/recipes/emacs/emacs-x11-23.1/configure.in.lost.backslashes.patch b/recipes/emacs/emacs-x11-23.1/configure.in.lost.backslashes.patch
new file mode 100644
index 0000000000..2d29f17e5f
--- /dev/null
+++ b/recipes/emacs/emacs-x11-23.1/configure.in.lost.backslashes.patch
@@ -0,0 +1,24 @@
+pending upstream, fixed in 23.2
+http://debbugs.gnu.org/cgi-bin/bugreport.cgi?bug=5047
+https://bugzilla.redhat.com/show_bug.cgi?id=540921
+diff -up emacs-23.1/configure.in.cpp emacs-23.1/configure.in
+--- emacs-23.1/configure.in.cpp 2009-11-30 13:24:53.000000000 +0100
++++ emacs-23.1/configure.in 2009-11-30 13:25:45.000000000 +0100
+@@ -2983,7 +2983,7 @@ echo creating lib-src/Makefile
+ sed -e '1,/start of cpp stuff/d'\
+ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+ < Makefile.c > junk.c
+- $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
++ $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
+ cat junk1.c junk2.c > Makefile.new
+ rm -f junk.c junk1.c junk2.c
+@@ -2999,7 +2999,7 @@ echo creating src/Makefile
+ sed -e '1,/start of cpp stuff/d'\
+ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+ < Makefile.c > junk.c
+- $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
++ $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
+ cat junk1.c junk2.c > Makefile.new
+ rm -f junk.c junk1.c junk2.c
diff --git a/recipes/emacs/emacs-x11_23.1.bb b/recipes/emacs/emacs-x11_23.1.bb
index aa535aa9ec..a2a22af2eb 100644
--- a/recipes/emacs/emacs-x11_23.1.bb
+++ b/recipes/emacs/emacs-x11_23.1.bb
@@ -3,7 +3,7 @@ require emacs.inc
# full X (non-diet) is needed for X support
DEPENDS += "gtk+ libungif dbus"
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = "--without-sound --with-x-toolkit=gtk"
@@ -13,8 +13,9 @@ RREPLACES_${PN} = "emacs"
FILESPATHPKG =. "emacs-${PV}:"
SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
- file://emacs23.1-use-qemu.patch \
- file://nostdlib-unwind.patch"
+ file://emacs23.1-use-qemu.patch \
+ file://nostdlib-unwind.patch \
+ file://configure.in.lost.backslashes.patch"
SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"