diff options
| author | Justin Patrin <papercrane@gmail.com> | 2006-08-06 03:24:05 +0000 |
|---|---|---|
| committer | Justin Patrin <papercrane@gmail.com> | 2006-08-06 03:24:05 +0000 |
| commit | c17055c12d5a4d7708ea61d05baa02ecb7c7922b (patch) | |
| tree | 63f70c9dfe7e0f525541efa46ba1ca9a39c15363 | |
| parent | e43549eb9619a4b8b0bbea4da0cb4282586a6429 (diff) | |
emacs: add --without-sound to fix building problems, fix FILES
| -rw-r--r-- | packages/emacs/emacs-x11_cvs.bb | 2 | ||||
| -rw-r--r-- | packages/emacs/emacs_cvs.bb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb index 6286ceaaf5..8fdba95742 100644 --- a/packages/emacs/emacs-x11_cvs.bb +++ b/packages/emacs/emacs-x11_cvs.bb @@ -1,5 +1,5 @@ require emacs_cvs.bb # full X (non-diet) is needed for X support DEPENDS += "libx11" -EXTRA_OECONF = "" +EXTRA_OECONF = "--without-sound" RREPLACES = "emacs" diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index 7e59cb23a0..4e7255e61c 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -8,7 +8,7 @@ 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 = "r6" +PR = "r7" DEFAULT_PREFERENCE = "-1" @@ -20,14 +20,15 @@ inherit autotools PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" -FILES_emacs-el = "${datadir}/emacs/22.0.50/*/*.el.gz \ +FILES_${PN}-el = "${datadir}/emacs/22.0.50/*/*.el.gz \ ${datadir}/emacs/22.0.50/*/*/*.el.gz" -QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" +FILES_${PN} += "${datadir}/emacs" +QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" -EXTRA_OECONF = "--without-x" +EXTRA_OECONF = "--without-sound --without-x" do_bootstrap() { cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" |