From cb4f5ecf32006192baaf41218a3d7b43ca1c2951 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 14 Dec 2016 23:28:24 +0100 Subject: nspr: set correct version in pkg-config file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit while we are at it clean up sed (From OE-Core rev: 69e9f7ec8ba8649784a27e9c7dc7a6987a53c22e) Signed-off-by: Andreas Müller Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/nspr/nspr/nspr.pc.in | 2 +- meta/recipes-support/nspr/nspr_4.13.1.bb | 11 +++++++---- 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 -- cgit 1.2.3-korg