diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-12-14 23:28:24 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-03 09:51:22 +0000 |
| commit | 79f821fb6c1b425ca5cb5e6db360c2743d6c989e (patch) | |
| tree | 060af6a6ad0dadf4f2debfbd8cf7ad82516bf572 | |
| parent | 85e087d9b323ad87c59900f01aad751c9c7a9e3a (diff) | |
| download | openembedded-core-79f821fb6c1b425ca5cb5e6db360c2743d6c989e.tar.gz openembedded-core-79f821fb6c1b425ca5cb5e6db360c2743d6c989e.tar.bz2 openembedded-core-79f821fb6c1b425ca5cb5e6db360c2743d6c989e.zip | |
nspr: set correct version in pkg-config file
while we are at it clean up sed
(From OE-Core rev: 69e9f7ec8ba8649784a27e9c7dc7a6987a53c22e)
(From OE-Core rev: cb4f5ecf32006192baaf41218a3d7b43ca1c2951)
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-support/nspr/nspr/nspr.pc.in | 2 | ||||
| -rw-r--r-- | meta/recipes-support/nspr/nspr_4.12.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.12.bb b/meta/recipes-support/nspr/nspr_4.12.bb index fa6d52357d..9345a51f39 100644 --- a/meta/recipes-support/nspr/nspr_4.12.bb +++ b/meta/recipes-support/nspr/nspr_4.12.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 |