Patchwork [3/4] classes/autotools-autoreconf: Allow owerwrite the autoreconf command

login
register
mail settings
Submitter Morten Svendsen
Date Oct. 17, 2012, 11:33 a.m.
Message ID <eb6bff8e4749c6b0ffee9f98cfb99af0fe3597cd.1350473427.git.morten.thunbergsvendsen@prevas.dk>
Download mbox | patch
Permalink /patch/192018/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Morten Svendsen - Oct. 17, 2012, 11:33 a.m.
Allows for recipes needing special auto tools command sequence
---
 classes/autotools-autoreconf.oeclass |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
Esben Haabendal - Oct. 22, 2012, 4:08 p.m.
Morten Thunberg Svendsen <morten.thunbergsvendsen@prevas.dk> writes:

> Allows for recipes needing special auto tools command sequence
> ---
>  classes/autotools-autoreconf.oeclass |    8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/classes/autotools-autoreconf.oeclass b/classes/autotools-autoreconf.oeclass
> index 825e8e4..1773ec4 100644
> --- a/classes/autotools-autoreconf.oeclass
> +++ b/classes/autotools-autoreconf.oeclass
> @@ -6,6 +6,10 @@ CLASS_DEPENDS += "${DEPENDS_AUTORECONF}"
>  DEPENDS_AUTORECONF ?= "native:glib-dev"
>  
>  EXTRA_AUTORECONF = ""
> +AUTORECONF_CMD ?= "autoreconf --verbose --install --force \
> +	${EXTRA_AUTORECONF} $acpaths \
> +"
> +
>  acpaths = "__default__"
>  
>  pkgltdldir = "${STAGE_DIR}/${HOST_CROSS}${stage_datadir}/libtool"
> @@ -76,9 +80,7 @@ do_autoreconf () {
>              export _lt_pkgdatadir="${pkgltdldir}"
>          fi
>          oenote Executing autoreconf
> -        autoreconf --verbose --install --force \
> -            ${EXTRA_AUTORECONF} $acpaths \
> -            || oefatal "autoreconf execution failed."
> +        eval "${AUTORECONF_CMD}" || oefatal 'autoreconf execution failed.'
>          if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
>              oenote Executing intltoolize
>              intltoolize --copy --force --automake

Merged to master and 3.2 branch.

/Esben

Patch

diff --git a/classes/autotools-autoreconf.oeclass b/classes/autotools-autoreconf.oeclass
index 825e8e4..1773ec4 100644
--- a/classes/autotools-autoreconf.oeclass
+++ b/classes/autotools-autoreconf.oeclass
@@ -6,6 +6,10 @@  CLASS_DEPENDS += "${DEPENDS_AUTORECONF}"
 DEPENDS_AUTORECONF ?= "native:glib-dev"
 
 EXTRA_AUTORECONF = ""
+AUTORECONF_CMD ?= "autoreconf --verbose --install --force \
+	${EXTRA_AUTORECONF} $acpaths \
+"
+
 acpaths = "__default__"
 
 pkgltdldir = "${STAGE_DIR}/${HOST_CROSS}${stage_datadir}/libtool"
@@ -76,9 +80,7 @@  do_autoreconf () {
             export _lt_pkgdatadir="${pkgltdldir}"
         fi
         oenote Executing autoreconf
-        autoreconf --verbose --install --force \
-            ${EXTRA_AUTORECONF} $acpaths \
-            || oefatal "autoreconf execution failed."
+        eval "${AUTORECONF_CMD}" || oefatal 'autoreconf execution failed.'
         if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
             oenote Executing intltoolize
             intltoolize --copy --force --automake