Skip to contentSkip to conversation

package/autotool infra: create missing m4 dir

PATCH New Yann E. MORIN 3 participants 4 messages Aug 18, 2012 – Aug 26, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/autotool infra: create missing m4 dir

When a package needs to be auto-reconfigured, it may be missing the m4/ sub-dir, especially when we use the package from its VCS.

Grep configure.{ac,in} tp find the location of the m4/ sub-dir (defaulting to the root of the package), and create it.

---

This is a tentative patch for RFC.

---
 package/pkg-autotools.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-autotools.mk +1 -0
index 785daab..f199ac6 100644
@@ -173,6 +173,7 @@ endif
 #
 define AUTORECONF_HOOK
 	@$$(call MESSAGE,"Autoreconfiguring")
+	M4_DIR=$$$$(sed -r -e '/.*AC_CONFIG_MACRO_DIR\(\[(.*)\]\).*/!d; s//\1/g;' $$($$(PKG)_SRCDIR)configure.*) && mkdir -p "$$($$(PKG)_SRCDIR)$$$${M4_DIR:-m4}"
 	$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
 	$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 1/1 package/autotool infra: create missing m4 dir

Hello,

Le Sat, 18 Aug 2012 14:48:33 +0200,
"Yann E. MORIN" <[email protected]> a ?crit :

Quoted 20 lines

When a package needs to be auto-reconfigured, it may be missing the m4/ sub-dir, especially when we use the package from its VCS.

Grep configure.{ac,in} tp find the location of the m4/ sub-dir (defaulting to the root of the package), and create it.

---

This is a tentative patch for RFC.

---
 package/pkg-autotools.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-autotools.mk +0 -0
index 785daab..f199ac6 100644

package/pkg-autotools.mk endif · line 179

Quoted 7 lines
package/pkg-autotools.mk +1 -0
@@ -173,6 +173,7 @@ endif
 #
 define AUTORECONF_HOOK
 	@$$(call MESSAGE,"Autoreconfiguring")
+	M4_DIR=$$$$(sed -r -e '/.*AC_CONFIG_MACRO_DIR\(\[(.*)\]\).*/!d; s//\1/g;' $$($$(PKG)_SRCDIR)configure.*) && mkdir -p "$$($$(PKG)_SRCDIR)$$$${M4_DIR:-m4}"
 	$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
 	$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \

Thanks for doing this. I am not yet totally convinced, but it needs some discussion. I find this approach a bit fragile, and I'm not sure it will cover all possibilities: I've seen packages doing more funky things than just creating the AC_CONFIG_MACRO_DIR directory in their autogen.sh/bootstrap script. For example, calling glibtoolize or intltoolize, which I'm not sure are automatically being called by autoreconf (but I may be wrong).

So, I see two alternative approaches to yours (I'm not saying those alternatives are better, just mentioning them to open the discussion):

1. Add an explicit <pkg>_AC_CONFIG_MACRO_DIR option, which defaults to m4, and which can be overridden by the package .mk file. The autotools infrastructure then creates in the source tree a directory of this name before doing the autoreconfiguration.

2. Make the autoreconf command configurable. I.e, by default the

    autotools infrastructure does $(AUTORECONF)
    $$($$(PKG)_AUTORECONF_OPT), but maybe we could use a
    $$($$(PKG)_AUTORECONF_CMDS) instead, so that you could do 'mkdir
    $(@D)/m4; $(@D)/autogen.sh' if you need, etc.

Thoughts?

Best regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 package/autotool infra: create missing m4 dir

Thomas, All,

Quoted 18 lines · On Tuesday 21 August 2012 11:33:12 Thomas Petazzoni wrote:

Le Sat, 18 Aug 2012 14:48:33 +0200,
"Yann E. MORIN" <[email protected]> a ?crit :

Quoted 15 lines

When a package needs to be auto-reconfigured, it may be missing the m4/ sub-dir, especially when we use the package from its VCS.

Grep configure.{ac,in} tp find the location of the m4/ sub-dir (defaulting to the root of the package), and create it.

---

This is a tentative patch for RFC.

---
 package/pkg-autotools.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 14 lines

package/pkg-autotools.mk endif · line 179

Quoted 12 lines
package/pkg-autotools.mk +1 -0
index 785daab..f199ac6 100644
@@ -173,6 +173,7 @@ endif
 #
 define AUTORECONF_HOOK
 	@$$(call MESSAGE,"Autoreconfiguring")
+	M4_DIR=$$$$(sed -r -e '/.*AC_CONFIG_MACRO_DIR\(\[(.*)\]\).*/!d; s//\1/g;' $$($$(PKG)_SRCDIR)configure.*) && mkdir -p "$$($$(PKG)_SRCDIR)$$$${M4_DIR:-m4}"
 	$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
 	$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \

Thanks for doing this. I am not yet totally convinced,

Yep, that's why I advertised it as an RFC. ;-)

Quoted 16 lines

but it needs
some discussion. I find this approach a bit fragile, and I'm not sure it will cover all possibilities: I've seen packages doing more funky things than just creating the AC_CONFIG_MACRO_DIR directory in their autogen.sh/bootstrap script. For example, calling glibtoolize or intltoolize, which I'm not sure are automatically being called by autoreconf (but I may be wrong).

So, I see two alternative approaches to yours (I'm not saying those alternatives are better, just mentioning them to open the discussion):

1. Add an explicit <pkg>_AC_CONFIG_MACRO_DIR option, which defaults to m4, and which can be overridden by the package .mk file. The autotools infrastructure then creates in the source tree a directory of this name before doing the autoreconfiguration.

Quoted 7 lines

2. Make the autoreconf command configurable. I.e, by default the

    autotools infrastructure does $(AUTORECONF)
    $$($$(PKG)_AUTORECONF_OPT), but maybe we could use a
    $$($$(PKG)_AUTORECONF_CMDS) instead, so that you could do 'mkdir
    $(@D)/m4; $(@D)/autogen.sh' if you need, etc.

Thoughts?

Well...
1) is pretty easy to do, but might not cover all cases, far from it, from what you said above. But it might be "good enough" it is catters for 90+% of packages.

2) should be relatively easy too, and is very versatile. OTOH, if one needs to run the buildroot's standard $(AUTORECONF), it can become a bit more complex.

So, what is the current state of packages in buildroot?

- 2 packages create a m4/ sub-dir:

    $ grep -c -r -E 'mkdir .*m4' * |grep -v -E ':0$'                                                                                                                        
    libiscsi/libiscsi.mk:1    mine, not yet upstream, missing m4/ dir
    sysprof/sysprof.mk:1      uses POST_PATCH_HOOK

--> so option 1) would really catter for only two packages

- 3 packages declare one or more PRE_CONFIG hooks:

    $ cd package; grep -c -r -E 'PRE_CONFIGURE_HOOKS[[:space:]]*[+:]?=' . \
      |grep -v -E ':0$'
    cups/cups.mk:1            calls only autoconf, standard autreconf breaks
    libiscsi/libiscsi.mk:1    mine, not yet upstream, missing m4/ dir
    socat/socat.mk:1          does not use automake, needs autoconf only

--> so option 2) would really catter for only two packages

I guess that's not really important to provide such a mechanism. Forget about my patch. ;-)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/1 package/autotool infra: create missing m4 dir

Quoted 8 lines · Yann E. MORIN

Thomas, All,

Quoted 5 lines · On Tuesday 21 August 2012 11:33:12 Thomas Petazzoni wrote:

Le Sat, 18 Aug 2012 14:48:33 +0200,
"Yann E. MORIN"<[email protected]> a ?crit :

Quoted 2 lines

When a package needs to be auto-reconfigured, it may be missing the m4/ sub-dir, especially when we use the package from its VCS.

[snip]

Quoted 49 lines
Quoted 16 lines

but it needs
some discussion. I find this approach a bit fragile, and I'm not sure it will cover all possibilities: I've seen packages doing more funky things than just creating the AC_CONFIG_MACRO_DIR directory in their autogen.sh/bootstrap script. For example, calling glibtoolize or intltoolize, which I'm not sure are automatically being called by autoreconf (but I may be wrong).

So, I see two alternative approaches to yours (I'm not saying those alternatives are better, just mentioning them to open the discussion):

1. Add an explicit<pkg>_AC_CONFIG_MACRO_DIR option, which defaults to m4, and which can be overridden by the package .mk file. The autotools infrastructure then creates in the source tree a directory of this name before doing the autoreconfiguration.

Quoted 7 lines
  2. Make the autoreconf command configurable. I.e, by default the
     autotools infrastructure does $(AUTORECONF)
     $$($$(PKG)_AUTORECONF_OPT), but maybe we could use a
     $$($$(PKG)_AUTORECONF_CMDS) instead, so that you could do 'mkdir
     $(@D)/m4; $(@D)/autogen.sh' if you need, etc.

Thoughts?

Well...
1) is pretty easy to do, but might not cover all cases, far from it, from what you said above. But it might be "good enough" it is catters for 90+% of packages.

2) should be relatively easy too, and is very versatile. OTOH, if one needs to run the buildroot's standard $(AUTORECONF), it can become a bit more complex.

So, what is the current state of packages in buildroot?

- 2 packages create a m4/ sub-dir:

     $ grep -c -r -E 'mkdir .*m4' * |grep -v -E ':0$'
     libiscsi/libiscsi.mk:1    mine, not yet upstream, missing m4/ dir
     sysprof/sysprof.mk:1      uses POST_PATCH_HOOK

--> so option 1) would really catter for only two packages

- 3 packages declare one or more PRE_CONFIG hooks:

     $ cd package; grep -c -r -E 'PRE_CONFIGURE_HOOKS[[:space:]]*[+:]?=' . \
       |grep -v -E ':0$'
     cups/cups.mk:1            calls only autoconf, standard autreconf breaks
     libiscsi/libiscsi.mk:1    mine, not yet upstream, missing m4/ dir
     socat/socat.mk:1          does not use automake, needs autoconf only
Quoted 4 lines

--> so option 2) would really catter for only two packages

I guess that's not really important to provide such a mechanism. Forget about my patch. ;-)

Even so, a "smarter" autoreconf would be less fragile than what we do now -
you'd expect the package's bootstrap.sh to be more complete than just a plain autoreconf. For instance, I had a package once that required a Changelog file to be present. We could add a $(PKG)_AUTORECONF_SCRIPT variable that defines the script.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F