Patchwork [1/1] libpng: avoid dangling link in libpng package

login
register
mail settings
Submitter Dongxiao Xu
Date Sept. 21, 2011, 8:18 a.m.
Message ID <299817d13d36871907df84623b600ca90961ac67.1316592963.git.dongxiao.xu@intel.com>
Download mbox | patch
Permalink /patch/11825/
State New, archived
Headers show

Comments

Dongxiao Xu - Sept. 21, 2011, 8:18 a.m.
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>
---
 meta/recipes-multimedia/libpng/libpng_1.2.46.bb |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
index 57d9037..0a28709 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}"