diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-22 16:34:16 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-23 09:32:56 +0100 |
| commit | 44eea8e0790ca6a2d19ab372aa4eb2b74dad2602 (patch) | |
| tree | 3cdd5462d220fde50a54631dcddde15d6f189d29 /meta-oe/recipes-support/emacs | |
| parent | 065f47980b663d0a4fdc0ded2f9f38b5138bbab8 (diff) | |
| download | meta-openembedded-contrib-44eea8e0790ca6a2d19ab372aa4eb2b74dad2602.tar.gz | |
emacs: fix build with libpng-1.5 from oe-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/emacs')
| -rw-r--r-- | meta-oe/recipes-support/emacs/emacs.inc | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-support/emacs/emacs_23.4.bb | 2 |
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 b7a7b756a1..e2a7e974c3 100644 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ b/meta-oe/recipes-support/emacs/emacs.inc @@ -109,7 +109,7 @@ do_compile_prepend() { ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libpng12.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \ ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ ${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 5ad5644880..cb0368e826 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 @@ require emacs.inc -PR = "r2" +PR = "r3" SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ file://use-qemu.patch \ |