diff options
| author | Justin Patrin <papercrane@gmail.com> | 2006-08-03 18:05:58 +0000 |
|---|---|---|
| committer | Justin Patrin <papercrane@gmail.com> | 2006-08-03 18:05:58 +0000 |
| commit | 18385db35fe7730b00ed1f0f530749f83948c133 (patch) | |
| tree | ca63c8ed4eaf5d7b73b4b2a78864365b39b947e5 | |
| parent | 880e8dba4d2efead6cced6e57f6b99735f904f9b (diff) | |
emacs: Add dated CVS emacs version, make default emacs not use x11, add emacs-x11
| -rw-r--r-- | packages/emacs/emacs-x11_20060801.bb | 3 | ||||
| -rw-r--r-- | packages/emacs/emacs-x11_cvs.bb | 5 | ||||
| -rw-r--r-- | packages/emacs/emacs_20060801.bb | 3 | ||||
| -rw-r--r-- | packages/emacs/emacs_cvs.bb | 10 |
4 files changed, 17 insertions, 4 deletions
diff --git a/packages/emacs/emacs-x11_20060801.bb b/packages/emacs/emacs-x11_20060801.bb new file mode 100644 index 0000000000..003857e139 --- /dev/null +++ b/packages/emacs/emacs-x11_20060801.bb @@ -0,0 +1,3 @@ +include emacs-x11_cvs.bb +SRCDATE = "${PV}" +DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb new file mode 100644 index 0000000000..874aacae4c --- /dev/null +++ b/packages/emacs/emacs-x11_cvs.bb @@ -0,0 +1,5 @@ +include emacs_cvs.bb +# full X (non-diet) is needed for X support +DEPENDS += "libx11" +EXTRA_OECONF = "" +RREPLACES = "emacs" diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb new file mode 100644 index 0000000000..642ede82fe --- /dev/null +++ b/packages/emacs/emacs_20060801.bb @@ -0,0 +1,3 @@ +include emacs_cvs.bb +SRCDATE = "${PV}" +DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index 8322e8f512..7e59cb23a0 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -3,14 +3,14 @@ HOMEPAGE = "http://www.gnu.org/software/emacs/" LICENSE = "GPLv2" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" SECTION = "editor" -# full X (non-diet) is needed for X support -DEPENDS = "libx11" # and it needs to run some generated binaries.. DEPENDS += "qemu-native" #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2 # the build gets hung up on compiling certain .el files -PR = "r5" +PR = "r6" + +DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs \ file://use-qemu.patch;patch=1" @@ -27,6 +27,8 @@ QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" +EXTRA_OECONF = "--without-x" + do_bootstrap() { cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" @@ -45,4 +47,4 @@ 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 +} |