[PATCH 0/3] autotools.bbclass misc trivia

[PATCH 0/3] autotools.bbclass misc trivia

[Bernhard Reutner-Fischer]

Hi,

In an isolated test with dash and busybox ash the AC_CONFIG_MACRO_DIR
patch works as expected. Testers welcome.

Bernhard Reutner-Fischer (3):
  autotools.bbclass: pass distro_imposed_configure_flags
  autotools.bblass: mkdir also AC_CONFIG_MACRO_DIR
  autotools.bbclass: use grep -q

 classes/autotools.bbclass |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

-- 
1.7.2.3

[PATCH 1/3] autotools.bbclass: pass distro_imposed_configure_flags

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 classes/autotools.bbclass |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 247e21d..77bd37d 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -65,6 +65,22 @@ def append_libtool_sysroot(d):
 			return '--with-libtool-sysroot=${STAGING_DIR_HOST}'
 	return ''
 
+def distro_imposed_configure_flags(d):
+	distro_features = bb.data.getVar('DISTRO_FEATURES', d, True) or ""
+	distro_features = distro_features.split()
+	flags = set()
+	features = (('largefile', 'largefile'),
+		('ipv6'     , 'ipv6'),
+		('nls'      , 'nls'))
+
+	for knob, cfgargs in features:
+		if isinstance(cfgargs, basestring):
+			cfgargs = [cfgargs]
+		en_or_dis = knob in distro_features and "enable" or "disable"
+		for flg in cfgargs:
+			flags.add("--%s-%s" % (en_or_dis, flg))
+	return " ".join(flags)
+
 # EXTRA_OECONF_append = "${@autotools_set_crosscompiling(d)}"
 
 CONFIGUREOPTS = " --build=${BUILD_SYS} \
@@ -85,6 +101,7 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \
 		  --infodir=${infodir} \
 		  --mandir=${mandir} \
 		  ${@append_libtool_sysroot(d)} \
+		  ${@distro_imposed_configure_flags(d)} \
 		"
 
 oe_runconf () {
-- 
1.7.2.3

[PATCH 2/3] autotools.bblass: mkdir also AC_CONFIG_MACRO_DIR

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 classes/autotools.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 77bd37d..45b75df 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -176,7 +176,9 @@ autotools_do_configure() {
 			fi
 
 			fi
-			mkdir -p m4
+			for aux in m4 `sed -n -e '/^[[:space:]]*AC_CONFIG_MACRO_DIR/s|[^(]*([[]*\([^])]*\)[]]*)|\1|p' $CONFIGURE_AC`; do
+				mkdir -p ${aux}
+			done
 			oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
 			autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed."
 			if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
-- 
1.7.2.3

[PATCH 3/3] autotools.bbclass: use grep -q

[Bernhard Reutner-Fischer]

-q is a required arg so use it instead of redirecting to /dev/null

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 classes/autotools.bbclass |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 45b75df..3850ae9 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -160,14 +160,14 @@ autotools_do_configure() {
 			else
 			  CONFIGURE_AC=configure.ac
 			fi
-			if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-			  if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
+			if grep -q "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC; then
+			  if grep -q "sed.*POTFILES" $CONFIGURE_AC; then
 			    : do nothing -- we still have an old unmodified configure.ac
 			  else
 			    oenote Executing glib-gettextize --force --copy
 			    echo "no" | glib-gettextize --force --copy
 			  fi
-			else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
+			else if grep -q "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then
 			  if [ -e ${STAGING_DATADIR}/gettext/config.rpath ]; then
 			    cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
 			  else
@@ -181,7 +181,7 @@ autotools_do_configure() {
 			done
 			oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
 			autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed."
-			if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
+			if grep -q "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC; then
 			  oenote Executing intltoolize --copy --force --automake
 			  intltoolize --copy --force --automake
 			fi
-- 
1.7.2.3

Re: [PATCH 0/3] autotools.bbclass misc trivia

[Khem Raj]

On 1/12/2011 12:15 PM, Bernhard Reutner-Fischer wrote:
> Hi,
>
> In an isolated test with dash and busybox ash the AC_CONFIG_MACRO_DIR
> patch works as expected. Testers welcome.
>
> Bernhard Reutner-Fischer (3):
>    autotools.bbclass: pass distro_imposed_configure_flags
>    autotools.bblass: mkdir also AC_CONFIG_MACRO_DIR
>    autotools.bbclass: use grep -q
>
>   classes/autotools.bbclass |   29 ++++++++++++++++++++++++-----
>   1 files changed, 24 insertions(+), 5 deletions(-)
>
Whole series

Acked-by: Khem Raj <raj.khem@gmail.com>

Re: [PATCH 0/3] autotools.bbclass misc trivia

[Tom Rini]

On 01/12/2011 01:41 PM, Khem Raj wrote:
> On 1/12/2011 12:15 PM, Bernhard Reutner-Fischer wrote:
>> Hi,
>>
>> In an isolated test with dash and busybox ash the AC_CONFIG_MACRO_DIR
>> patch works as expected. Testers welcome.
>>
>> Bernhard Reutner-Fischer (3):
>> autotools.bbclass: pass distro_imposed_configure_flags
>> autotools.bblass: mkdir also AC_CONFIG_MACRO_DIR
>> autotools.bbclass: use grep -q
>>
>> classes/autotools.bbclass | 29 ++++++++++++++++++++++++-----
>> 1 files changed, 24 insertions(+), 5 deletions(-)
>>
> Whole series
>
> Acked-by: Khem Raj <raj.khem@gmail.com>

Acked-by: Tom Rini <tom_rini@mentor.com>

-- 
Tom Rini
Mentor Graphics Corporation

Re: [oe] [PATCH 0/3] autotools.bbclass misc trivia

[Bernhard Reutner-Fischer]

It seems to me this was never pushed, or was it reverted in
the meantime (if so, why? who takes care of passing these in nowadays?)

Thanks,

On 13 January 2011 01:29, Tom Rini <tom_rini@mentor.com> wrote:
> On 01/12/2011 01:41 PM, Khem Raj wrote:
>>
>> On 1/12/2011 12:15 PM, Bernhard Reutner-Fischer wrote:
>>>
>>> Hi,
>>>
>>> In an isolated test with dash and busybox ash the AC_CONFIG_MACRO_DIR
>>> patch works as expected. Testers welcome.
>>>
>>> Bernhard Reutner-Fischer (3):
>>> autotools.bbclass: pass distro_imposed_configure_flags
>>> autotools.bblass: mkdir also AC_CONFIG_MACRO_DIR
>>> autotools.bbclass: use grep -q
>>>
>>> classes/autotools.bbclass | 29 ++++++++++++++++++++++++-----
>>> 1 files changed, 24 insertions(+), 5 deletions(-)
>>>
>> Whole series
>>
>> Acked-by: Khem Raj <raj.khem@gmail.com>
>
>
> Acked-by: Tom Rini <tom_rini@mentor.com>
>
> --
> Tom Rini
> Mentor Graphics Corporation
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH 0/3] autotools.bbclass misc trivia

[Bernhard Reutner-Fischer]

It seems to me this was never pushed, or was it reverted in
the meantime (if so, why? who takes care of passing these in nowadays?)

Thanks,

On 13 January 2011 01:29, Tom Rini <tom_rini@mentor.com> wrote:
> On 01/12/2011 01:41 PM, Khem Raj wrote:
>>
>> On 1/12/2011 12:15 PM, Bernhard Reutner-Fischer wrote:
>>>
>>> Hi,
>>>
>>> In an isolated test with dash and busybox ash the AC_CONFIG_MACRO_DIR
>>> patch works as expected. Testers welcome.
>>>
>>> Bernhard Reutner-Fischer (3):
>>> autotools.bbclass: pass distro_imposed_configure_flags
>>> autotools.bblass: mkdir also AC_CONFIG_MACRO_DIR
>>> autotools.bbclass: use grep -q
>>>
>>> classes/autotools.bbclass | 29 ++++++++++++++++++++++++-----
>>> 1 files changed, 24 insertions(+), 5 deletions(-)
>>>
>> Whole series
>>
>> Acked-by: Khem Raj <raj.khem@gmail.com>
>
>
> Acked-by: Tom Rini <tom_rini@mentor.com>
>
> --
> Tom Rini
> Mentor Graphics Corporation
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel