[oe-commits] [meta-openembedded] 44/141: lua: use PV for generating Version in lua.pc
git at git.openembedded.org
git at git.openembedded.org
Wed Feb 24 13:08:38 UTC 2016
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 9f9f45bb1660be40157f1c237de6549e505104f5
Author: Maciej Borzecki <maciej.borzecki at open-rnd.pl>
AuthorDate: Thu Feb 11 11:12:50 2016 +0100
lua: use PV for generating Version in lua.pc
Lua was updated to 5.3.2, however lua.pc still has 5.2.2 listed as
Version in pkg-config metadata file. Instead of bumping the Version
field in lua.pc make sure that we are future proof and update the field
automatically with value of ${PV}.
Signed-off-by: Maciej Borzecki <maciej.borzecki at open-rnd.pl>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-devtools/lua/lua/{lua.pc => lua.pc.in} | 2 +-
meta-oe/recipes-devtools/lua/lua_5.3.2.bb | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-devtools/lua/lua/lua.pc b/meta-oe/recipes-devtools/lua/lua/lua.pc.in
similarity index 90%
rename from meta-oe/recipes-devtools/lua/lua/lua.pc
rename to meta-oe/recipes-devtools/lua/lua/lua.pc.in
index e6f8b6f..fe22016 100644
--- a/meta-oe/recipes-devtools/lua/lua/lua.pc
+++ b/meta-oe/recipes-devtools/lua/lua/lua.pc.in
@@ -4,7 +4,7 @@ includedir=${prefix}/include
Name: Lua
Description: Lua language engine
-Version: 5.2.2
+Version: @VERSION@
Requires:
Libs: -L${libdir} -llua
Libs.private: -lm
diff --git a/meta-oe/recipes-devtools/lua/lua_5.3.2.bb b/meta-oe/recipes-devtools/lua/lua_5.3.2.bb
index 0cc882d..f97ed50 100644
--- a/meta-oe/recipes-devtools/lua/lua_5.3.2.bb
+++ b/meta-oe/recipes-devtools/lua/lua_5.3.2.bb
@@ -8,7 +8,7 @@ PR = "r0"
DEPENDS = "readline"
SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \
- file://lua.pc \
+ file://lua.pc.in \
"
SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', \
'http://www.lua.org/tests/lua-${PV}-tests.tar.gz;name=tarballtest \
@@ -47,6 +47,8 @@ do_install () {
'INSTALL_CMOD=${D}${libdir}/lua/5.3' \
install
install -d ${D}${libdir}/pkgconfig
+
+ sed -e s/@VERSION@/${PV}/ ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc
install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/
rmdir ${D}${datadir}/lua/5.3
rmdir ${D}${datadir}/lua
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list