diff options
| author | Matthias Hentges <oe@hentges.net> | 2007-12-23 14:40:59 +0000 |
|---|---|---|
| committer | Matthias Hentges <oe@hentges.net> | 2007-12-23 14:40:59 +0000 |
| commit | 485571cde482594a85494905868eae7a46cfc3a1 (patch) | |
| tree | 85c9d059a1d26f15f2cd56144f2855aac2cc7784 /packages/emacs | |
| parent | 0d240fc455c013943e170a70828d825ced38354e (diff) | |
| parent | 17a572144f53d6f1abf1fee46d8e41c38e561b01 (diff) | |
merge of '4a88a5ffedd700d28476cfaa227e1fde7e0a2fed'
and '7cacda73f6295d69f1f1e7f92b77d847df223b1b'
Diffstat (limited to 'packages/emacs')
| -rw-r--r-- | packages/emacs/emacs-x11_20060801.bb | 4 | ||||
| -rw-r--r-- | packages/emacs/emacs-x11_cvs.bb | 3 | ||||
| -rw-r--r-- | packages/emacs/emacs_20060801.bb | 2 | ||||
| -rw-r--r-- | packages/emacs/emacs_cvs.bb | 12 |
4 files changed, 14 insertions, 7 deletions
diff --git a/packages/emacs/emacs-x11_20060801.bb b/packages/emacs/emacs-x11_20060801.bb index 8b598bf21f..3878c42536 100644 --- a/packages/emacs/emacs-x11_20060801.bb +++ b/packages/emacs/emacs-x11_20060801.bb @@ -1,3 +1,5 @@ require emacs-x11_cvs.bb -SRCDATE = "${PV}" + +SRCDATE = "20060801" + DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb index 8fdba95742..809176a3c3 100644 --- a/packages/emacs/emacs-x11_cvs.bb +++ b/packages/emacs/emacs-x11_cvs.bb @@ -1,5 +1,8 @@ require emacs_cvs.bb + # full X (non-diet) is needed for X support DEPENDS += "libx11" + EXTRA_OECONF = "--without-sound" + RREPLACES = "emacs" diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb index aa72944eca..834e5b6239 100644 --- a/packages/emacs/emacs_20060801.bb +++ b/packages/emacs/emacs_20060801.bb @@ -1,3 +1,3 @@ require emacs_cvs.bb -SRCDATE = "${PV}" +SRCDATE = "20060801" DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index ef58dfa5b6..e8f263d1a9 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -7,7 +7,9 @@ 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 = "r7" +PV = "22.0.50+cvs${SRCDATE}" +PE = "1" +PR = "r9" DEFAULT_PREFERENCE = "-1" @@ -17,14 +19,14 @@ S = "${WORKDIR}/emacs" inherit autotools -PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" +PACKAGES =+ "${PN}-el" -FILES_${PN}-el = "${datadir}/emacs/22.0.50/*/*.el.gz \ - ${datadir}/emacs/22.0.50/*/*/*.el.gz" +FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \ + ${datadir}/emacs/*/*/*/*.el.gz" FILES_${PN} += "${datadir}/emacs" -QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" +QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" EXTRA_OECONF = "--without-sound --without-x" |