From patchwork Thu Nov  1 10:42:49 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [5/9] bzip2: Remove call to "bash ./autogen.sh" in do_configure,
 use autoreconf with custom reconf
Date: Thu, 01 Nov 2012 00:42:49 -0000
From: Esben Haabendal <esben.haabendal@dev.prevas.dk>
X-Patchwork-Id: 196150
Message-Id: <87fw4t61ue.fsf@arh128.prevas.dk>
To: Morten Thunberg Svendsen <morten.thunbergsvendsen@prevas.dk>
Cc: dev@oe-lite.org

Morten Thunberg Svendsen <morten.thunbergsvendsen@prevas.dk> writes:

> ---
>  recipes/bzip2/bzip2.inc |   17 +++++++++++------
>  1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/recipes/bzip2/bzip2.inc b/recipes/bzip2/bzip2.inc
> index e11ab73..dad6b46 100644
> --- a/recipes/bzip2/bzip2.inc
> +++ b/recipes/bzip2/bzip2.inc
> @@ -2,7 +2,17 @@ DESCRIPTION = "Very high-quality data compression program"
>  
>  RECIPE_TYPES = "machine native sdk"
>  
> -inherit autotools pkgconfig
> +inherit autotools-autoreconf pkgconfig
> +AUTORECONF_CMD = " \
> +   mv LICENSE COPYING; \
> +   mv CHANGES NEWS; \
> +   touch AUTHORS \
> +&& touch ChangeLog \
> +&& ${LIBTOOLIZE} --force --copy \
> +&& aclocal -I . $acpaths --force \
> +&& automake -a --copy --force --gnu \
> +&& autoconf -I . $acpaths --force \
> +"
>  
>  SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz"
>  
> @@ -34,8 +44,3 @@ RDEPENDS_${PN}-bzdiff = "${PN}-libbz2"
>  RDEPENDS_${PN}-bzgrep = "${PN}-libbz2"
>  RDEPENDS_${PN}-bzip2recover = "${PN}-libbz2"
>  RDEPENDS_${PN}-bzmore = "${PN}-libbz2"
> -
> -do_configure () {
> -    bash ./autogen.sh
> -    do_configure_autotools
> -}

Can you the fix below also.  It works with old OE-lite/core versions
also.


diff --git a/recipes/bzip2/bzip2.inc b/recipes/bzip2/bzip2.inc
index e11ab73..8af1c7e 100644
--- a/recipes/bzip2/bzip2.inc
+++ b/recipes/bzip2/bzip2.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Very high-quality data compression program"
 
 RECIPE_TYPES = "machine native sdk"
 
-inherit autotools pkgconfig
+inherit autotools-autoreconf pkgconfig
 
 SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz"
 
@@ -35,7 +35,10 @@ RDEPENDS_${PN}-bzgrep = "${PN}-libbz2"
 RDEPENDS_${PN}-bzip2recover = "${PN}-libbz2"
 RDEPENDS_${PN}-bzmore = "${PN}-libbz2"
 
-do_configure () {
-    bash ./autogen.sh
-    do_configure_autotools
+do_autoreconf[prefuncs] += "do_autoreconf_prep"
+do_autoreconf_prep() {
+       ln -sf LICENSE COPYING
+       ln -sf CHANGES NEWS
+       touch AUTHORS
+       touch ChangeLog
 }