summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-21 16:12:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-21 13:32:34 +0100
commit50232671951e0b69d52a685b82a10be335458292 (patch)
tree6c496a1137c33f9e175133f1fd2f4797fbd82e43
parentc89aa6a2b22e05e98991cc5b56d6ec869cf9c69a (diff)
downloadopenembedded-core-50232671951e0b69d52a685b82a10be335458292.tar.gz
openembedded-core-50232671951e0b69d52a685b82a10be335458292.tar.bz2
openembedded-core-50232671951e0b69d52a685b82a10be335458292.zip
libpng: avoid dangling link in libpng package
As for libpng recipe, the libpng.pc is a symbol link to libpng12.pc, if packaging them into two different packages, we will get a dangling link for libpng.pc, and when calculating rpm dependency with that file, we will get nothing. Only keep one version of dev package to fix the issue. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.2.46.bb6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
index 57d9037949..0a28709ae7 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
@@ -6,7 +6,7 @@ LICENSE = "Libpng"
LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \
file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc"
DEPENDS = "zlib"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
@@ -15,11 +15,9 @@ SRC_URI[sha256sum] = "a5e796e1802b2e221498bda09ff9850bc7ec9068b6788948cc2c42af21
inherit autotools binconfig pkgconfig
-PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
+PACKAGES =+ "${PN}12"
-FILES_${PN}12-dbg = "${libdir}/.debug/libpng12*"
FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
-FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc"
FILES_${PN} = "${libdir}/lib*${SOLIBS}"
FILES_${PN}-dev += " ${bindir} ${sbindir}"