summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2016-12-14 23:28:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-17 09:56:42 +0000
commitcb4f5ecf32006192baaf41218a3d7b43ca1c2951 (patch)
treed2d8fad28a4565de989cb9cffb7346309f987f83
parent21c3d1b354dbb6cd6f3d574785f70858d828d977 (diff)
downloadopenembedded-core-contrib-cb4f5ecf32006192baaf41218a3d7b43ca1c2951.tar.gz
openembedded-core-contrib-cb4f5ecf32006192baaf41218a3d7b43ca1c2951.tar.bz2
openembedded-core-contrib-cb4f5ecf32006192baaf41218a3d7b43ca1c2951.zip
nspr: set correct version in pkg-config file
while we are at it clean up sed (From OE-Core rev: 69e9f7ec8ba8649784a27e9c7dc7a6987a53c22e) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nspr/nspr/nspr.pc.in2
-rw-r--r--meta/recipes-support/nspr/nspr_4.13.1.bb11
2 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in
index c37d0bcbd7..d74caabe4c 100644
--- a/meta/recipes-support/nspr/nspr/nspr.pc.in
+++ b/meta/recipes-support/nspr/nspr/nspr.pc.in
@@ -6,6 +6,6 @@ includedir=OEINCDIR
Name: NSPR
Description: The Netscape Portable Runtime
-Version: 4.9.5
+Version: NSPRVERSION
Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl
Cflags:
diff --git a/meta/recipes-support/nspr/nspr_4.13.1.bb b/meta/recipes-support/nspr/nspr_4.13.1.bb
index 4a13f398ee..23f8944a87 100644
--- a/meta/recipes-support/nspr/nspr_4.13.1.bb
+++ b/meta/recipes-support/nspr/nspr_4.13.1.bb
@@ -160,10 +160,13 @@ do_compile_append() {
do_install_append() {
install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc
- sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
- 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
+ sed -i \
+ -e 's:NSPRVERSION:${PV}:g' \
+ -e 's:OEPREFIX:${prefix}:g' \
+ -e 's:OELIBDIR:${libdir}:g' \
+ -e 's:OEINCDIR:${includedir}:g' \
+ -e 's:OEEXECPREFIX:${exec_prefix}:g' \
+ ${D}${libdir}/pkgconfig/nspr.pc
mkdir -p ${D}${libdir}/nspr/tests
install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests