[ptxdist] [PATCH] host-m4: provide a recent version to make the autotools happy

[ptxdist] [PATCH] host-m4: provide a recent version to make the autotools happy

[Juergen Beisert]

Since commit 5ef597fcaa290267e8cffe33b60b870cda0d52fa the autotools-autoconf
package forces a very specific and recent M4 version. Otherwise it fails
with:
    
checking for GNU M4 that supports accurate traces...
 configure: error: no acceptable m4 could be found in $PATH.
GNU M4 1.4.6 or later is required; 1.4.16 or newer is recommended.
GNU M4 1.4.15 uses a buggy replacement strstr on some systems.
Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug.
    
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

diff --git a/rules/host-autotools-autoconf.in b/rules/host-autotools-autoconf.in
index 2af70df..dbb7dce 100644
--- a/rules/host-autotools-autoconf.in
+++ b/rules/host-autotools-autoconf.in
@@ -3,4 +3,5 @@
 config HOST_AUTOTOOLS_AUTOCONF
 	bool
 	select HOST_SYSTEM_PERL
+	select HOST_M4
 	default y
diff --git a/rules/host-m4.in b/rules/host-m4.in
new file mode 100644
index 0000000..b135d22
--- /dev/null
+++ b/rules/host-m4.in
@@ -0,0 +1,4 @@
+## SECTION=hosttools_noprompt
+
+config HOST_M4
+	bool
diff --git a/rules/host-m4.make b/rules/host-m4.make
new file mode 100644
index 0000000..dd168fe
--- /dev/null
+++ b/rules/host-m4.make
@@ -0,0 +1,36 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Juergen Beisert <jbe@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_M4) += host-m4
+
+#
+# Paths and names
+#
+HOST_M4_VERSION	:= 1.4.17
+HOST_M4_MD5	:= 12a3c829301a4fd6586a57d3fcf196dc
+HOST_M4		:= m4-$(HOST_M4_VERSION)
+HOST_M4_SUFFIX	:= tar.xz
+HOST_M4_URL	:= http://ftp.gnu.org/gnu/m4/$(HOST_M4).$(HOST_M4_SUFFIX)
+HOST_M4_SOURCE	:= $(SRCDIR)/$(HOST_M4).$(HOST_M4_SUFFIX)
+HOST_M4_DIR	:= $(HOST_BUILDDIR)/$(HOST_M4)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+HOST_M4_CONF_TOOL	:= autoconf
+
+# vim: syntax=make

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] host-m4: provide a recent version to make the autotools happy

[Michael Olbrich]

On Mon, Apr 07, 2014 at 09:55:17AM +0200, Juergen Beisert wrote:
> Since commit 5ef597fcaa290267e8cffe33b60b870cda0d52fa the autotools-autoconf
> package forces a very specific and recent M4 version. Otherwise it fails
> with:
>     
> checking for GNU M4 that supports accurate traces...
>  configure: error: no acceptable m4 could be found in $PATH.
> GNU M4 1.4.6 or later is required; 1.4.16 or newer is recommended.
> GNU M4 1.4.15 uses a buggy replacement strstr on some systems.
> Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug.
>     
> Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

Thanks, applied.

Michael

> 
> diff --git a/rules/host-autotools-autoconf.in b/rules/host-autotools-autoconf.in
> index 2af70df..dbb7dce 100644
> --- a/rules/host-autotools-autoconf.in
> +++ b/rules/host-autotools-autoconf.in
> @@ -3,4 +3,5 @@
>  config HOST_AUTOTOOLS_AUTOCONF
>  	bool
>  	select HOST_SYSTEM_PERL
> +	select HOST_M4
>  	default y
> diff --git a/rules/host-m4.in b/rules/host-m4.in
> new file mode 100644
> index 0000000..b135d22
> --- /dev/null
> +++ b/rules/host-m4.in
> @@ -0,0 +1,4 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_M4
> +	bool
> diff --git a/rules/host-m4.make b/rules/host-m4.make
> new file mode 100644
> index 0000000..dd168fe
> --- /dev/null
> +++ b/rules/host-m4.make
> @@ -0,0 +1,36 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 by Juergen Beisert <jbe@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_M4) += host-m4
> +
> +#
> +# Paths and names
> +#
> +HOST_M4_VERSION	:= 1.4.17
> +HOST_M4_MD5	:= 12a3c829301a4fd6586a57d3fcf196dc
> +HOST_M4		:= m4-$(HOST_M4_VERSION)
> +HOST_M4_SUFFIX	:= tar.xz
> +HOST_M4_URL	:= http://ftp.gnu.org/gnu/m4/$(HOST_M4).$(HOST_M4_SUFFIX)
> +HOST_M4_SOURCE	:= $(SRCDIR)/$(HOST_M4).$(HOST_M4_SUFFIX)
> +HOST_M4_DIR	:= $(HOST_BUILDDIR)/$(HOST_M4)
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +HOST_M4_CONF_TOOL	:= autoconf
> +
> +# vim: syntax=make
> 
> -- 
> Pengutronix e.K.                              | Juergen Beisert             |
> Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de