From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from thebe.hi.pengutronix.de ([2001:6f8:1178:2:5e26:aff:fe2b:7cc4])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <jbe@pengutronix.de>) id 1WX4LT-0003Lf-5g
	for ptxdist@pengutronix.de; Mon, 07 Apr 2014 09:51:55 +0200
From: Juergen Beisert <jbe@pengutronix.de>
Date: Mon, 7 Apr 2014 09:55:17 +0200
MIME-Version: 1.0
Content-Disposition: inline
Message-Id: <201404070955.17020.jbe@pengutronix.de>
Subject: [ptxdist] [PATCH] host-m4: provide a recent version to make the
	autotools happy
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="iso-8859-15"
Content-Transfer-Encoding: quoted-printable
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

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-autoco=
nf.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=3Dhosttools_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) +=3D host-m4
+
+#
+# Paths and names
+#
+HOST_M4_VERSION	:=3D 1.4.17
+HOST_M4_MD5	:=3D 12a3c829301a4fd6586a57d3fcf196dc
+HOST_M4		:=3D m4-$(HOST_M4_VERSION)
+HOST_M4_SUFFIX	:=3D tar.xz
+HOST_M4_URL	:=3D http://ftp.gnu.org/gnu/m4/$(HOST_M4).$(HOST_M4_SUFFIX)
+HOST_M4_SOURCE	:=3D $(SRCDIR)/$(HOST_M4).$(HOST_M4_SUFFIX)
+HOST_M4_DIR	:=3D $(HOST_BUILDDIR)/$(HOST_M4)
+
+# ------------------------------------------------------------------------=
----
+# Prepare
+# ------------------------------------------------------------------------=
----
+
+#
+# autoconf
+#
+HOST_M4_CONF_TOOL	:=3D autoconf
+
+# vim: syntax=3Dmake

-- =

Pengutronix e.K. =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0| Juergen Beisert =A0 =A0 =A0 =A0 =A0 =A0 |
Linux Solutions for Science and Industry =A0 =A0 =A0| http://www.pengutroni=
x.de/  |

-- =

ptxdist mailing list
ptxdist@pengutronix.de