From 4047e5ca84c9b61fed0512b804aded0288679cf1 Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Thu, 11 Feb 2016 11:12:50 +0100 Subject: 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 Signed-off-by: Martin Jansa --- meta-oe/recipes-devtools/lua/lua/lua.pc | 11 ----------- meta-oe/recipes-devtools/lua/lua/lua.pc.in | 11 +++++++++++ meta-oe/recipes-devtools/lua/lua_5.3.2.bb | 4 +++- 3 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 meta-oe/recipes-devtools/lua/lua/lua.pc create mode 100644 meta-oe/recipes-devtools/lua/lua/lua.pc.in diff --git a/meta-oe/recipes-devtools/lua/lua/lua.pc b/meta-oe/recipes-devtools/lua/lua/lua.pc deleted file mode 100644 index e6f8b6f096..0000000000 --- a/meta-oe/recipes-devtools/lua/lua/lua.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: Lua -Description: Lua language engine -Version: 5.2.2 -Requires: -Libs: -L${libdir} -llua -Libs.private: -lm -Cflags: -I${includedir} diff --git a/meta-oe/recipes-devtools/lua/lua/lua.pc.in b/meta-oe/recipes-devtools/lua/lua/lua.pc.in new file mode 100644 index 0000000000..fe22016037 --- /dev/null +++ b/meta-oe/recipes-devtools/lua/lua/lua.pc.in @@ -0,0 +1,11 @@ +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: Lua +Description: Lua language engine +Version: @VERSION@ +Requires: +Libs: -L${libdir} -llua +Libs.private: -lm +Cflags: -I${includedir} 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 0cc882df2e..f97ed509f4 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 -- cgit v1.2.3-54-g00ecf