summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-12-15 15:14:56 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-12-15 18:57:33 (GMT)
commitcb4ab36bcf15560eb52ab78500db317ad0a963d9 (patch)
tree2d82c7fa7ef59de42945e8e060497476f1ac6093
parent169403079a10a783cce02b00ae8adf5509dfc04a (diff)
downloadbuildroot-cb4ab36bcf15560eb52ab78500db317ad0a963d9.tar.gz
buildroot-cb4ab36bcf15560eb52ab78500db317ad0a963d9.tar.bz2
autoconf: add patch to make it work under dash
autoconf >= 2.64 was broken when /bin/sh is symlinked to dash. This has been fixed post-2.65 by the commit at http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=7f75858f577f11a844781764f30cd42cfe8a5669. Compared to the original patch, the patch included in Buildroot manually does the change to the ./configure script itself. Otherwise, the compilation of host-autoconf would require host-autoconf itself. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch b/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
new file mode 100644
index 0000000..35f99b2
--- /dev/null
+++ b/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
@@ -0,0 +1,36 @@
+Patch taken upstream at
+http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=7f75858f577f11a844781764f30cd42cfe8a5669,
+with the following modifications:
+
+ * Changes to NEWS file removed to avoid conflicts
+
+ * Changes also made manually to the generated configure
+ script. Otherwise, host-autoconf is needed to compile
+ host-autoconf !
+
+Index: autoconf-2.65.old/configure
+===================================================================
+--- autoconf-2.65.old.orig/configure 2009-12-15 16:11:05.175566911 +0100
++++ autoconf-2.65.old/configure 2009-12-15 16:11:37.739562146 +0100
+@@ -2380,7 +2380,7 @@
+ ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
+ ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
+ test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
+- && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
++ && test -z "`$as_echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
+ && test -f conftest.m4f \
+ && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
+ rm -f conftest.m4f
+Index: autoconf-2.65.old/m4/m4.m4
+===================================================================
+--- autoconf-2.65.old.orig/m4/m4.m4 2009-12-15 16:11:05.207566124 +0100
++++ autoconf-2.65.old/m4/m4.m4 2009-12-15 16:11:18.595562030 +0100
+@@ -29,7 +29,7 @@
+ ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
+ ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
+ test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
+- && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
++ && test -z "`AS_ECHO([$ac_snippet]) | $ac_path_M4 --trace=mac 2>&1`" \
+ && test -f conftest.m4f \
+ && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
+ rm -f conftest.m4f],