summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-12-22 16:34:16 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-23 09:32:56 +0100
commit44eea8e0790ca6a2d19ab372aa4eb2b74dad2602 (patch)
tree3cdd5462d220fde50a54631dcddde15d6f189d29
parent065f47980b663d0a4fdc0ded2f9f38b5138bbab8 (diff)
downloadmeta-openembedded-44eea8e0790ca6a2d19ab372aa4eb2b74dad2602.tar.gz
emacs: fix build with libpng-1.5 from oe-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/emacs/emacs.inc2
-rw-r--r--meta-oe/recipes-support/emacs/emacs_23.4.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index b7a7b756a..e2a7e974c 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -109,7 +109,7 @@ do_compile_prepend() {
109 ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ 109 ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \
110 ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ 110 ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \
111 ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ 111 ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \
112 ${STAGING_DIR_TARGET}/${libdir}/libpng12.so.* \ 112 ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \
113 ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ 113 ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \
114 ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ 114 ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \
115 ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \ 115 ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \
diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb
index 5ad564488..cb0368e82 100644
--- a/meta-oe/recipes-support/emacs/emacs_23.4.bb
+++ b/meta-oe/recipes-support/emacs/emacs_23.4.bb
@@ -1,6 +1,6 @@
1require emacs.inc 1require emacs.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ 5SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
6 file://use-qemu.patch \ 6 file://use-qemu.patch \