summaryrefslogtreecommitdiff
path: root/packages/emacs
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2006-07-27 01:34:27 +0000
committerJustin Patrin <papercrane@gmail.com>2006-07-27 01:34:27 +0000
commit685bc62d0e1698a72ce1685e1cb737a6203c2850 (patch)
treeb75bf8676819fcdfd8dac33cbe44c86b48b37f94 /packages/emacs
parent7ff8b90eb121fe4cc1f7a8a86ff789e29e6fe207 (diff)
emacs: split out el files into their own package, make bootstrap its own task, fix quoting in patch, add one more place to use QEMU
Diffstat (limited to 'packages/emacs')
-rw-r--r--packages/emacs/emacs_cvs.bb21
-rw-r--r--packages/emacs/files/use-qemu.patch14
2 files changed, 29 insertions, 6 deletions
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index e1ab949d0a..ab4a1fc2ca 100644
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -7,23 +7,26 @@ SECTION = "editor"
DEPENDS = "libx11"
# and it needs to run some generated binaries..
DEPENDS += "qemu-native"
-PR = "r2"
+PR = "r3"
SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs \
file://use-qemu.patch;patch=1"
-# http://fabrice.bellard.free.fr/qemu/qemu-gnemul-0.5.3.tar.gz"
S = "${WORKDIR}/emacs"
inherit autotools
-#EXTRA_OECONF = "--without-x"
+PACKAGES = "emacs emacs-el"
+
+FILES_emacs-el = "${datadir}/emacs/22.0.50/*/*.el.gz \
+ ${datadir}/emacs/22.0.50/*/*/*.el.gz"
-#QEMU = "/usr/bin/qemu-arm -L ${WORKDIR}/usr/local/gnemul/qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
-do_compile_prepend() {
+do_bootstrap() {
+ cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}"
export QEMU="${QEMU}"
sed -i 's:/usr/lib:${STAGING_LIBDIR}:g' ${S}/src/s/gnu-linux.h
@@ -32,3 +35,11 @@ do_compile_prepend() {
cd "${S}"
make bootstrap
}
+
+addtask bootstrap before do_compile after do_configure
+
+do_compile_prepend() {
+ cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}"
+ export QEMU="${QEMU}"
+} \ No newline at end of file
diff --git a/packages/emacs/files/use-qemu.patch b/packages/emacs/files/use-qemu.patch
index b23f1d631e..8e4481f64f 100644
--- a/packages/emacs/files/use-qemu.patch
+++ b/packages/emacs/files/use-qemu.patch
@@ -6,7 +6,7 @@ diff -Nur emacs~/Makefile.in emacs/Makefile.in
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-prepare)
(cd src; $(MAKE) $(MFLAGS) bootstrap)
- (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs${EXEEXT})
-+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS="${QEMU} ../src/bootstrap-emacs${EXEEXT}")
++ (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS="${QEMU} ../src/bootstrap-emacs${EXEEXT})"
(cd src; $(MAKE) $(MFLAGS) mostlyclean)
$(MAKE) $(MFLAGS) all
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)
@@ -34,6 +34,18 @@ diff -Nur emacs~/lib-src/Makefile.in emacs/lib-src/Makefile.in
/* We need the following in order to create a <getopt.h> when the system
doesn't have one that works with the given compiler. */
+diff -Nur emacs~/lisp/Makefile.in emacs/lisp/Makefile.in
+--- emacs~/lisp/Makefile.in 2006-07-25 09:45:55.000000000 -0700
++++ emacs/lisp/Makefile.in 2006-07-26 14:09:59.000000000 -0700
+@@ -28,7 +28,7 @@
+ # You can specify a different executable on the make command line,
+ # e.g. "make EMACS=../src/emacs ...".
+
+-EMACS = ../src/emacs
++EMACS = ${QEMU} ../src/emacs
+
+ # Command line flags for Emacs. This must include --multibyte,
+ # otherwise some files will not compile.
diff -Nur emacs~/src/Makefile.in emacs/src/Makefile.in
--- emacs~/src/Makefile.in 2006-07-25 09:46:16.000000000 -0700
+++ emacs/src/Makefile.in 2006-07-26 07:37:44.000000000 -0700