From: Daniel Dickinson <daniel@cshore.neomailbox.net>
Date: Sun, 12 Dec 2010 01:43:46 +0000 (+0000)
Subject: [toolchain] binutils: Fix autoreconf for packages/devel/binutils package, which uses... 
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=9046a2a13281dd0bbd4725f325aa43b2b457c6db;hp=233156346981edd742922ce6d5c45aabe198c63c;p=15.05%2Fopenwrt.git

[toolchain] binutils: Fix autoreconf for packages/devel/binutils package, which uses binutils toolchain patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24509 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/toolchain/binutils/patches/2.20.1/400-autoreconf-compat.patch b/toolchain/binutils/patches/2.20.1/400-autoreconf-compat.patch
new file mode 100644
index 0000000000..d5451e8129
--- /dev/null
+++ b/toolchain/binutils/patches/2.20.1/400-autoreconf-compat.patch
@@ -0,0 +1,84 @@
+--- a/config/override.m4
++++ b/config/override.m4
+@@ -32,31 +32,6 @@ dnl Redefine AC_CONFIG_SUBDIRS so acloca
+ dnl when needed.
+ 
+ ifdef([m4_PACKAGE_VERSION],
+-[dnl AC_DEFUN a commonly used macro so this file is picked up.
+-m4_copy([AC_PREREQ], [_AC_PREREQ])
+-AC_DEFUN([AC_PREREQ], [frob])
+-m4_copy_force([_AC_PREREQ], [AC_PREREQ])
+-
+-
+-dnl Ensure exactly this Autoconf version is used
+-m4_ifndef([_GCC_AUTOCONF_VERSION],
+-  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
+-
+-dnl Test for the exact version when AC_INIT is expanded.
+-dnl This allows to update the tree in steps (for testing)
+-dnl by putting
+-dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
+-dnl in configure.ac before AC_INIT,
+-dnl without rewriting this file.
+-dnl Or for updating the whole tree at once with the definition above.
+-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
+-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
+-  m4_defn([m4_PACKAGE_VERSION]), [],
+-  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
+-])
+-m4_define([AC_INIT], m4_defn([AC_INIT])[
+-_GCC_AUTOCONF_VERSION_CHECK
+-])
+ 
+ 
+ dnl Turn AC_DISABLE_OPTION_CHECKING into a no-op if not defined.
+--- a/gas/aclocal.m4
++++ b/gas/aclocal.m4
+@@ -998,7 +998,6 @@ m4_include([../config/nls.m4])
+ m4_include([../config/override.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])
+--- a/bfd/aclocal.m4
++++ b/bfd/aclocal.m4
+@@ -978,7 +978,6 @@ m4_include([../config/plugins.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+ m4_include([../config/stdint.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])
+--- a/binutils/aclocal.m4
++++ b/binutils/aclocal.m4
+@@ -1003,7 +1003,6 @@ m4_include([../config/override.m4])
+ m4_include([../config/plugins.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])
+--- a/ld/aclocal.m4
++++ b/ld/aclocal.m4
+@@ -999,7 +999,6 @@ m4_include([../config/nls.m4])
+ m4_include([../config/override.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])
+--- a/opcodes/aclocal.m4
++++ b/opcodes/aclocal.m4
+@@ -978,7 +978,6 @@ m4_include([../config/nls.m4])
+ m4_include([../config/override.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])