Patchwork [1/1] nspr: fix package spliting

login
register
mail settings
Submitter Dexuan Cui
Date April 13, 2012, 10:04 a.m.
Message ID <01480f0f7418b8ceac72201e1b285495d2e23d58.1334311268.git.dexuan.cui@intel.com>
Download mbox | patch
Permalink /patch/25731/
State New
Headers show

Comments

Dexuan Cui - April 13, 2012, 10:04 a.m.
Here /usr/lib/lib*.so files are binaries rather than symbol links.
We should package them into ${PN} rather than ${PN}-dev, or else,
when a package, that rdepends on nspr, is packaged, we get a
"non-dev package rdepends on nspr-dev" ERROR.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-support/nspr/nspr_4.8.9.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
Darren Hart - April 14, 2012, 12:07 a.m.
On 04/13/2012 03:04 AM, Dexuan Cui wrote:
> Here /usr/lib/lib*.so files are binaries rather than symbol links.
> We should package them into ${PN} rather than ${PN}-dev, or else,
> when a package, that rdepends on nspr, is packaged, we get a
> "non-dev package rdepends on nspr-dev" ERROR.

Applied and built for qemux86. Had to bump PR to "r4" to increase past
another applied change.

> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>

Tested-by: Darren Hart <dvhart@linux.intel.com>

> ---
>  meta/recipes-support/nspr/nspr_4.8.9.bb |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-support/nspr/nspr_4.8.9.bb b/meta/recipes-support/nspr/nspr_4.8.9.bb
> index 8b840d9..d3c683c 100644
> --- a/meta/recipes-support/nspr/nspr_4.8.9.bb
> +++ b/meta/recipes-support/nspr/nspr_4.8.9.bb
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=40;md5=99d4d7d68bbc4
>                      file://Makefile.in;beginline=4;endline=38;md5=c2b512182a334e1bfa1edc4d1c84a298 "
>  SECTION = "libs/network"
>  
> -PR = "r2"
> +PR = "r3"
>  
>  SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
>             file://remove-rpath-from-tests.patch \
> @@ -160,6 +160,7 @@ do_install_append() {
>      install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
>  }
>  
> -FILES_${PN} = "${bindir}/*"
> -FILES_${PN}-dev += "${libdir}/nspr/tests/*"
> +FILES_${PN} = "${bindir}/* ${libdir}/lib*.so"
> +FILES_${PN}-dev = "${libdir}/nspr/tests/* ${libdir}/pkgconfig \
> +                ${includedir}/* ${datadir}/aclocal/* "
>  FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*"

Patch

diff --git a/meta/recipes-support/nspr/nspr_4.8.9.bb b/meta/recipes-support/nspr/nspr_4.8.9.bb
index 8b840d9..d3c683c 100644
--- a/meta/recipes-support/nspr/nspr_4.8.9.bb
+++ b/meta/recipes-support/nspr/nspr_4.8.9.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=40;md5=99d4d7d68bbc4
                     file://Makefile.in;beginline=4;endline=38;md5=c2b512182a334e1bfa1edc4d1c84a298 "
 SECTION = "libs/network"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
            file://remove-rpath-from-tests.patch \
@@ -160,6 +160,7 @@  do_install_append() {
     install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
 }
 
-FILES_${PN} = "${bindir}/*"
-FILES_${PN}-dev += "${libdir}/nspr/tests/*"
+FILES_${PN} = "${bindir}/* ${libdir}/lib*.so"
+FILES_${PN}-dev = "${libdir}/nspr/tests/* ${libdir}/pkgconfig \
+                ${includedir}/* ${datadir}/aclocal/* "
 FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*"