diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-09-21 16:12:45 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-21 13:42:53 +0100 |
commit | d380bb126a1e79d181437cb76f048579432394da (patch) | |
tree | f27cc2bfefc525412a1417623ea9cd89a8bbe056 /meta/recipes-multimedia/libpng/libpng_1.2.46.bb | |
parent | c81cd242dffdf0bd779fe524f72a2d4785c9456d (diff) | |
download | poky-d380bb126a1e79d181437cb76f048579432394da.tar.gz |
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.
(From OE-Core rev: 50232671951e0b69d52a685b82a10be335458292)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libpng/libpng_1.2.46.bb')
-rw-r--r-- | meta/recipes-multimedia/libpng/libpng_1.2.46.bb | 6 |
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" | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \ |
7 | file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc" | 7 | file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc" |
8 | DEPENDS = "zlib" | 8 | DEPENDS = "zlib" |
9 | PR = "r0" | 9 | PR = "r1" |
10 | 10 | ||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2" | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2" |
12 | 12 | ||
@@ -15,11 +15,9 @@ SRC_URI[sha256sum] = "a5e796e1802b2e221498bda09ff9850bc7ec9068b6788948cc2c42af21 | |||
15 | 15 | ||
16 | inherit autotools binconfig pkgconfig | 16 | inherit autotools binconfig pkgconfig |
17 | 17 | ||
18 | PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" | 18 | PACKAGES =+ "${PN}12" |
19 | 19 | ||
20 | FILES_${PN}12-dbg = "${libdir}/.debug/libpng12*" | ||
21 | FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" | 20 | FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" |
22 | FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" | ||
23 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" | 21 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" |
24 | FILES_${PN}-dev += " ${bindir} ${sbindir}" | 22 | FILES_${PN}-dev += " ${bindir} ${sbindir}" |
25 | 23 | ||