[oe] [meta-oe][PATCH v2 1/2] lua: use PV for generating Version in lua.pc

[Andreas Müller]

On Thu, Feb 11, 2016 at 11:12 AM, Maciej Borzecki
<maciej.borzecki at open-rnd.pl> wrote:
> 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>
> ---
>  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 e6f8b6f096dbcf578665699d2e3570dd22088d40..0000000000000000000000000000000000000000
> --- 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 0000000000000000000000000000000000000000..fe220160374a2a7261ed9ada91d0c8f9969bf3b6
> --- /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 3fe8c3fe88ec3f1159738c6b5e421bc987df176d..7d25cf8cbda973c0707e55a34b0df33cd6e7a4ab 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 \
> -           file://lua.pc \
> +           file://lua.pc.in \
>  "
>
>  SRC_URI[md5sum] = "33278c2ab5ee3c1a875be8d55c1ca2a1"
> @@ -41,6 +41,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
> --
> 2.5.0
>
Looks good - thanks. Minor nitpick for future patches: Please use 'git
format-patch -M' or set

[diff]
    renames = true

in your .gitconfig

to reduce diff

Andreas