From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 13 Jan 2015 02:55:19 +0000 (-0800)
Subject: nspr: fix B != S
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~31568
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66b747597d231c00fefe51d52ed5f836b9a3c482;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

nspr: fix B != S

And bump the PR to avoid:
make[3]: ../../../config/./nsinstall: Command not found

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---

diff --git a/meta/recipes-support/nspr/nspr_4.10.7.bb b/meta/recipes-support/nspr/nspr_4.10.7.bb
index 69e9dfa6a3c..de281974c5c 100644
--- a/meta/recipes-support/nspr/nspr_4.10.7.bb
+++ b/meta/recipes-support/nspr/nspr_4.10.7.bb
@@ -21,8 +21,7 @@ S = "${WORKDIR}/nspr-${PV}/nspr"
 RDEPENDS_${PN}-dev += "perl"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
-TESTS = "runtests.pl \
-    runtests.sh \
+TESTS = " \
     accept \
     acceptread \
     acceptreademu \
@@ -138,7 +137,9 @@ TESTS = "runtests.pl \
     xnotify \
     zerolen"
 
-inherit autotools-brokensep
+PR = "r1"
+
+inherit autotools
 
 do_compile_prepend() {
 	oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export
@@ -154,8 +155,11 @@ do_install_append() {
     sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nspr.pc
     sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nspr.pc
     sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
-    cd ${S}/pr/tests
+
     mkdir -p ${D}${libdir}/nspr/tests
+    install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests
+    install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests
+    cd ${B}/pr/tests
     install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
 
     # delete compile-et.pl and perr.properties from ${bindir} because these are