From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [RC Fixes 18/19] libpng: avoid dangling link in libpng package
Date: Wed, 21 Sep 2011 02:39:34 -0700 [thread overview]
Message-ID: <5e381252e9513e77cbdcf94bf1db53eaf1122099.1316597628.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1316597628.git.sgw@linux.intel.com>
In-Reply-To: <cover.1316597628.git.sgw@linux.intel.com>
From: Dongxiao Xu <dongxiao.xu@intel.com>
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(-)
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}"
--
1.7.6
next prev parent reply other threads:[~2011-09-21 9:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
2011-09-21 9:39 ` [RC Fixes 01/19] scripts/combo-layer: fix still overzealous regex in default hook script Saul Wold
2011-09-21 9:39 ` [RC Fixes 02/19] deb packages support: switch from /var/dpkg to /var/lib/dpkg Saul Wold
2011-09-21 9:39 ` [RC Fixes 03/19] libzypp: git repo moved to github Saul Wold
2011-09-21 9:39 ` [RC Fixes 04/19] sat-solver: " Saul Wold
2011-09-21 9:39 ` [RC Fixes 05/19] zypper: " Saul Wold
2011-09-21 9:39 ` [RC Fixes 06/19] distrodata: fix distro_check code Saul Wold
2011-09-21 9:39 ` [RC Fixes 07/19] distro tracking: Update Distro Aliases Saul Wold
2011-09-21 10:35 ` Koen Kooi
2011-09-21 9:39 ` [RC Fixes 08/19] avahi: Refactor recipe to move UI to avahi-ui Saul Wold
2011-09-21 9:39 ` [RC Fixes 09/19] rpm: add multilib prefix for archs under deploy/rpm Saul Wold
2011-09-21 9:39 ` [RC Fixes 10/19] multilib: install MULTILIB_IMAGE_INSTALL Saul Wold
2011-09-21 9:39 ` [RC Fixes 11/19] Fix RPM dependencies Saul Wold
2011-09-21 9:39 ` [RC Fixes 12/19] Add a run-time dependency that eglibc support GNU_HASH Saul Wold
2011-09-21 9:39 ` [RC Fixes 13/19] Update python dependencies to be simply to "python" Saul Wold
2011-09-21 9:39 ` [RC Fixes 14/19] busybox: Enhance to add dynamic per-file provides Saul Wold
2011-09-21 9:39 ` [RC Fixes 15/19] multilib_global.bbclass: Fix non-multilib package provides Saul Wold
2011-09-21 9:39 ` [RC Fixes 16/19] Fix alsa-utils package dependencies Saul Wold
2011-09-21 9:39 ` [RC Fixes 17/19] oprofileui: Change avahi to avahi-ui depends Saul Wold
2011-09-21 9:39 ` Saul Wold [this message]
2011-09-21 9:39 ` [RC Fixes 19/19] libpng: add libpng12-dev packages Saul Wold
2011-09-21 12:44 ` [RC Fixes 00/19] Fixes for Multi-Lib & other patches Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5e381252e9513e77cbdcf94bf1db53eaf1122099.1316597628.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox