Patchwork nspr: remove unnecessary files from the main package

login
register
mail settings
Submitter Laurentiu Palcu
Date March 25, 2013, 4:08 p.m.
Message ID <1364227698-2785-1-git-send-email-laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/46865/
State Accepted
Commit 5ec19c8bccdb20cd392969b8a14d72f6114757cf
Headers show

Comments

Laurentiu Palcu - March 25, 2013, 4:08 p.m.
This patch does the following:
 * removes compile-et.pl and prerr.properties from the main package
   because these files are needed only at compile time;
 * moves nspr-config script to nspr-dev package where it belongs;
 * adds 'perl' RDEPENDS for nspr-dev since the package contains a perl
   script for running some tests;

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta/recipes-support/nspr/nspr_4.9.5.bb |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-support/nspr/nspr_4.9.5.bb b/meta/recipes-support/nspr/nspr_4.9.5.bb
index 7975d14..d18b12e 100644
--- a/meta/recipes-support/nspr/nspr_4.9.5.bb
+++ b/meta/recipes-support/nspr/nspr_4.9.5.bb
@@ -16,6 +16,8 @@  SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-$
 
 SRC_URI += "file://nspr.pc.in"
 
+RDEPENDS_${PN}-dev += "perl"
+
 SRC_URI[md5sum] = "b6ccfa8fcbbeb17ebeb19a3edff612bd"
 SRC_URI[sha256sum] = "616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604"
 
@@ -163,9 +165,14 @@  do_install_append() {
     cd ${S}/pr/tests
     mkdir -p ${D}${libdir}/nspr/tests
     install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
+
+    # delete compile-et.pl and perr.properties from ${bindir} because these are
+    # only used to generate prerr.c and prerr.h files from prerr.et at compile
+    # time
+    rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties
 }
 
-FILES_${PN} = "${bindir}/* ${libdir}/lib*.so"
-FILES_${PN}-dev = "${libdir}/nspr/tests/* ${libdir}/pkgconfig \
+FILES_${PN} = "${libdir}/lib*.so"
+FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \
                 ${includedir}/* ${datadir}/aclocal/* "
 FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*"