[oe-commits] [openembedded-core] 11/15: bzip2: set the autoconf package version to the recipe version

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit beb4fb0b0e89ce6b80645322ee435a6b4909b652
Author: Andreas Obergschwandtner <andreas.obergschwandtner at skidata.com>
AuthorDate: Mon Aug 5 16:35:55 2019 +0200

    bzip2: set the autoconf package version to the recipe version
    
    This is done to require only a single version change if bzip2
    is updated and fixes also setting package version 1.0.6 for
    bzip2 1.0.8.
    
    Signed-off-by: Andreas Obergschwandtner <andreas.obergschwandtner at skidata.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/bzip2/bzip2/configure.ac | 2 +-
 meta/recipes-extended/bzip2/bzip2_1.0.8.bb     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/bzip2/bzip2/configure.ac b/meta/recipes-extended/bzip2/bzip2/configure.ac
index e2bf1bf..b8abade 100644
--- a/meta/recipes-extended/bzip2/bzip2/configure.ac
+++ b/meta/recipes-extended/bzip2/bzip2/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 
-AC_INIT(bzip2, 1.0.6)
+AC_INIT(bzip2, %BZIP2_VERSION%)
 AM_INIT_AUTOMAKE(foreign)
 AM_MAINTAINER_MODE
 
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
index 6f86b45..8e9b779 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
@@ -29,6 +29,10 @@ ALTERNATIVE_${PN} = "bunzip2 bzcat bzip2"
 #install binaries to bzip2-native under sysroot for replacement-native
 EXTRA_OECONF_append_class-native = " --bindir=${STAGING_BINDIR_NATIVE}/${PN}"
 
+do_configure_prepend () {
+    sed -i -e "s|%BZIP2_VERSION%|${PV}|" ${S}/configure.ac
+}
+
 do_install_ptest () {
 	sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.