summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-12 18:55:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:08:24 +0000
commit3b1324b177c0d2b937726a13e672830f1f27132b (patch)
tree518a755f27c5d474cf3d20468f6f0a929d913f20
parent92597b5d8afd898ba7d685763f1372c34a83d315 (diff)
downloadpoky-3b1324b177c0d2b937726a13e672830f1f27132b.tar.gz
nspr: fix B != S
And bump the PR to avoid: make[3]: ../../../config/./nsinstall: Command not found (From OE-Core rev: 66b747597d231c00fefe51d52ed5f836b9a3c482) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nspr/nspr_4.10.7.bb12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-support/nspr/nspr_4.10.7.bb b/meta/recipes-support/nspr/nspr_4.10.7.bb
index 69e9dfa6a3..de281974c5 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"
21RDEPENDS_${PN}-dev += "perl" 21RDEPENDS_${PN}-dev += "perl"
22TARGET_CC_ARCH += "${LDFLAGS}" 22TARGET_CC_ARCH += "${LDFLAGS}"
23 23
24TESTS = "runtests.pl \ 24TESTS = " \
25 runtests.sh \
26 accept \ 25 accept \
27 acceptread \ 26 acceptread \
28 acceptreademu \ 27 acceptreademu \
@@ -138,7 +137,9 @@ TESTS = "runtests.pl \
138 xnotify \ 137 xnotify \
139 zerolen" 138 zerolen"
140 139
141inherit autotools-brokensep 140PR = "r1"
141
142inherit autotools
142 143
143do_compile_prepend() { 144do_compile_prepend() {
144 oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export 145 oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export
@@ -154,8 +155,11 @@ do_install_append() {
154 sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nspr.pc 155 sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nspr.pc
155 sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nspr.pc 156 sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nspr.pc
156 sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nspr.pc 157 sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
157 cd ${S}/pr/tests 158
158 mkdir -p ${D}${libdir}/nspr/tests 159 mkdir -p ${D}${libdir}/nspr/tests
160 install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests
161 install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests
162 cd ${B}/pr/tests
159 install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests 163 install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
160 164
161 # delete compile-et.pl and perr.properties from ${bindir} because these are 165 # delete compile-et.pl and perr.properties from ${bindir} because these are