From patchwork Sun Dec 23 12:21:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-oe,07/30] emacs: fix build with libpng-1.5 from oe-core Date: Sun, 23 Dec 2012 12:21:32 -0000 From: Martin Jansa X-Patchwork-Id: 41535 Message-Id: <44eea8e0790ca6a2d19ab372aa4eb2b74dad2602.1356264861.git.Martin.Jansa@gmail.com> To: openembedded-devel@lists.openembedded.org Signed-off-by: Martin Jansa --- meta-oe/recipes-support/emacs/emacs.inc | 2 +- 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 b7a7b75..e2a7e97 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 5ad5644..cb0368e 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 \