Patchwork [5/9] bzip2: Remove call to "bash ./autogen.sh" in do_configure, use autoreconf with custom reconf

login
register
mail settings
Submitter Esben Haabendal
Date Nov. 1, 2012, 10:42 a.m.
Message ID <87fw4t61ue.fsf@arh128.prevas.dk>
Download mbox | patch
Permalink /patch/196150/
State Superseded
Headers show

Comments

Esben Haabendal - Nov. 1, 2012, 10:42 a.m.
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.
Morten Svendsen - Nov. 1, 2012, 11:56 p.m.
On 01-11-2012 11:42, Esben Haabendal wrote:
> 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.
>


The below fix also works, no need for AUTORECONF_CMD.



> 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
>   }
>
Esben Haabendal - Nov. 2, 2012, 1:31 p.m.
Morten Thunberg Svendsen <Morten.ThunbergSvendsen@prevas.dk> writes:

> On 01-11-2012 11:42, Esben Haabendal wrote:
>> Morten Thunberg Svendsen <morten.thunbergsvendsen@prevas.dk> writes:
>> Can you the fix below also.  It works with old OE-lite/core versions
>> also.
>
> The below fix also works, no need for AUTORECONF_CMD.

Ok, I will drop this patch then.  We still have the AUTORECONF_CMD
support in OE-lite/core (since 3.2.0).  No reason to remove that.

/Esben

Patch

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
 }