diff options
| author | Justin Patrin <papercrane@gmail.com> | 2006-07-26 15:40:25 +0000 |
|---|---|---|
| committer | Justin Patrin <papercrane@gmail.com> | 2006-07-26 15:40:25 +0000 |
| commit | a37d7ceccbd994913b06a8120ae0f4c6a8737074 (patch) | |
| tree | 4a23756261f0d1b1b6aacdc120ace19e043358b6 /packages/emacs/emacs_cvs.bb | |
| parent | d2414814f650f14ec5b7e2f58a3631e9384b8dfc (diff) | |
emacs: switch to using a patch instead of sed hackery, turn x11 back off since the default is diet-x11
Diffstat (limited to 'packages/emacs/emacs_cvs.bb')
| -rw-r--r-- | packages/emacs/emacs_cvs.bb | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index cba1372926..1ee8d0ecbc 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -4,18 +4,19 @@ LICENSE = "GPLv2" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" SECTION = "editor" # full X (non-diet) is needed for X support -DEPENDS = "libx11" +#DEPENDS = "libx11" # and it needs to run some generated binaries.. DEPENDS += "qemu-native" -PR = "r1" +PR = "r2" -SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs" +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 = "--with-x" +EXTRA_OECONF = "--without-x" #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}" @@ -23,22 +24,11 @@ QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" do_compile_prepend() { - sed -i 's:/usr/lib:${STAGING_LIBDIR}:g' ${S}/src/s/gnu-linux.h - - find "${S}" -name Makefile | xargs sed -i 's:^RUN_TEMACS = ./temacs$:RUN_TEMACS = ${QEMU} ./temacs:' - find "${S}" -name Makefile | xargs sed -i 's:EMACS=../src/bootstrap-emacs:EMACS="${QEMU} ../src/bootstrap-emacs":' - - # src-lib/Makefile - find "${S}" -name Makefile | xargs sed -i 's:./test-distrib :${QEMU} ./test-distrib :' - - # src/Makefile - find "${S}" -name Makefile | xargs sed -i 's:./prefix-args :${QEMU} ./prefix-args :' - find "${S}" -name Makefile | xargs sed -i 's:$''{libsrc}make-docfile :${QEMU} $''{libsrc}make-docfile :' - - # leim/Makefile - find "${S}" -name Makefile | xargs sed -i 's:BUILD-EMACS = :BUILT-EMACS = ${QEMU} :' + export QEMU="${QEMU}" + sed -i 's:/usr/lib:${STAGING_LIBDIR}:g' ${S}/src/s/gnu-linux.h find "${S}" -name Makefile | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:g' - cd ${S} + + cd "${S}" make bootstrap } |