diff mbox series

autoconf: update to 2.70

Message ID 20210118015034.12345-1-rosenp@gmail.com
State Rejected
Delegated to: Paul Spooren
Headers show
Series autoconf: update to 2.70 | expand

Commit Message

Rosen Penev Jan. 18, 2021, 1:50 a.m. UTC 
Refreshed patches.

Removed emacs patch as upstream removed emacs completely.

Removed musl host patch. Upstream seems to have fixed it differently.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 tools/autoconf/Makefile                       |   4 +-
 tools/autoconf/patches/000-relocatable.patch  | 107 +++++++-----------
 tools/autoconf/patches/001-no_emacs_lib.patch |  22 ----
 .../patches/002-musl_host_fixup.patch         |  24 ----
 4 files changed, 42 insertions(+), 115 deletions(-)
 delete mode 100644 tools/autoconf/patches/001-no_emacs_lib.patch
 delete mode 100644 tools/autoconf/patches/002-musl_host_fixup.patch

Comments

Paul Spooren Jan. 18, 2021, 6:29 p.m. UTC | #1 
On So, Jan 17, 2021 at 17:50, Rosen Penev <rosenp@gmail.com> wrote:
> Refreshed patches.
> 
> Removed emacs patch as upstream removed emacs completely.
> 
> Removed musl host patch. Upstream seems to have fixed it differently.
> 
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
> ---

Please disable the doc building, at least that's how I interpret this 
error message:

/buildbot/shared-workdir/build/build_dir/host/autoconf-2.70/build-aux/missing: 
line 81: help2man: command not found
WARNING: 'help2man' is missing on your system.
         You should only need it if you modified a dependency of a man 
page.
         You may want to install the GNU Help2man package:
         <https://www.gnu.org/software/help2man/>
make[4]: *** [Makefile:2209: man/autoconf.1] Error 127

https://buildmaster.aparcar.org/master/phase1/#/builders/4/builds/6

Best,
Paul

>  tools/autoconf/Makefile                       |   4 +-
>  tools/autoconf/patches/000-relocatable.patch  | 107 
> +++++++-----------
>  tools/autoconf/patches/001-no_emacs_lib.patch |  22 ----
>  .../patches/002-musl_host_fixup.patch         |  24 ----
>  4 files changed, 42 insertions(+), 115 deletions(-)
>  delete mode 100644 tools/autoconf/patches/001-no_emacs_lib.patch
>  delete mode 100644 tools/autoconf/patches/002-musl_host_fixup.patch
> 
> diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile
> index 6eb64d77d5..0fac14a6be 100644
> --- a/tools/autoconf/Makefile
> +++ b/tools/autoconf/Makefile
> @@ -7,11 +7,11 @@
>  include $(TOPDIR)/rules.mk
> 
>  PKG_NAME:=autoconf
> -PKG_VERSION:=2.69
> +PKG_VERSION:=2.70
> 
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
>  PKG_SOURCE_URL:=@GNU/autoconf
> -PKG_HASH:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684
> +PKG_HASH:=fa9e227860d9d845c0a07f63b88c8d7a2ae1aa2345fb619384bb8accc19fecc6
> 
>  include $(INCLUDE_DIR)/host-build.mk
> 
> diff --git a/tools/autoconf/patches/000-relocatable.patch 
> b/tools/autoconf/patches/000-relocatable.patch
> index 12e94ae9a1..930fdd880d 100644
> --- a/tools/autoconf/patches/000-relocatable.patch
> +++ b/tools/autoconf/patches/000-relocatable.patch
> @@ -1,6 +1,6 @@
>  --- a/bin/autoheader.in
>  +++ b/bin/autoheader.in
> -@@ -28,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
> +@@ -32,7 +32,8 @@ use warnings FATAL => 'all';
> 
>   BEGIN
>   {
> @@ -10,32 +10,27 @@
>     unshift @INC, "$pkgdatadir";
> 
>     # Override SHELL.  On DJGPP SHELL may not be set to a shell
> -@@ -50,7 +51,7 @@ use strict;
> - use vars qw ($config_h %verbatim %symbol);
> +@@ -54,7 +55,7 @@ use Autom4te::XFile;
> + our ($config_h, %symbol, %verbatim);
> 
>   # Lib files.
>  -my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
>  +my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? 
> $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : 
> '@bindir@/@autom4te-name@');
> - local $config_h;
>   my $config_h_in;
>   my @prepend_include;
> + my @include;
>  --- a/bin/autom4te.in
>  +++ b/bin/autom4te.in
> -@@ -1,10 +1,12 @@
> --#! @PERL@ -w
> -+#! @PERL@
> - # -*- perl -*-
> - # @configure_input@
> -
> +@@ -5,6 +5,8 @@
>   eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" 
> "$@";; esac'
>       if 0;
> 
>  +$^W = 1;
>  +
>   # autom4te - Wrapper around M4 libraries.
> - # Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc.
> -
> -@@ -24,7 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
> + # Copyright (C) 2001-2003, 2005-2017, 2020 Free Software Foundation,
> + # Inc.
> +@@ -28,7 +30,8 @@ use warnings FATAL => 'all';
> 
>   BEGIN
>   {
> @@ -45,8 +40,8 @@
>     unshift @INC, $pkgdatadir;
> 
>     # Override SHELL.  On DJGPP SHELL may not be set to a shell
> -@@ -44,7 +47,8 @@ use File::Basename;
> - use strict;
> +@@ -48,7 +51,8 @@ use Autom4te::General;
> + use Autom4te::XFile;
> 
>   # Data directory.
>  -my $pkgdatadir = $ENV{'AC_MACRODIR'} || '@pkgdatadir@';
> @@ -55,7 +50,7 @@
> 
>   # $LANGUAGE{LANGUAGE} -- Automatic options for LANGUAGE.
>   my %language;
> -@@ -87,7 +91,7 @@ my @include;
> +@@ -91,7 +95,7 @@ my @include;
>   my $freeze = 0;
> 
>   # $M4.
> @@ -64,7 +59,7 @@
>   # Some non-GNU m4's don't reject the --help option, so give them 
> /dev/null.
>   fatal "need GNU m4 1.4 or later: $m4"
>     if system "$m4 --help </dev/null 2>&1 | grep reload-state 
> >/dev/null";
> -@@ -269,6 +273,12 @@ sub load_configuration ($)
> +@@ -272,6 +276,12 @@ sub load_configuration ($)
> 
>         my @words = shellwords ($_);
>         my $type = shift @words;
> @@ -79,22 +74,17 @@
>   	  fatal "$file:$.: end-language missing for: $lang"
>  --- a/bin/autoreconf.in
>  +++ b/bin/autoreconf.in
> -@@ -1,10 +1,12 @@
> --#! @PERL@ -w
> -+#! @PERL@
> - # -*- perl -*-
> - # @configure_input@
> -
> +@@ -5,6 +5,8 @@
>   eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" 
> "$@";; esac'
>       if 0;
> 
>  +$^W = 1;
>  +
>   # autoreconf - install the GNU Build System in a directory tree
> - # Copyright (C) 1994, 1999-2012 Free Software Foundation, Inc.
> -
> -@@ -26,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
> + # Copyright (C) 1994, 1999-2017, 2020 Free Software Foundation, Inc.
> 
> +@@ -31,7 +33,8 @@ use warnings FATAL => 'all';
> + my $buildauxdir;
>   BEGIN
>   {
>  -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
> @@ -102,31 +92,25 @@
>  +	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . 
> '/../host/share/autoconf' : '@pkgdatadir@');
>     unshift @INC, $pkgdatadir;
> 
> -   # Override SHELL.  On DJGPP SHELL may not be set to a shell
> -@@ -106,9 +109,9 @@ Written by David J. MacKenzie and Akim D
> +   $buildauxdir = $ENV{'autom4te_buildauxdir'} || $pkgdatadir . 
> '/build-aux';
> +@@ -116,9 +119,9 @@ Written by David J. MacKenzie and Akim D
>   ";
> 
>   # Lib files.
> --my $autoconf   = $ENV{'AUTOCONF'}   || '@bindir@/@autoconf-name@';
> --my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
> --my $autom4te   = $ENV{'AUTOM4TE'}   || '@bindir@/@autom4te-name@';
> -+my $autoconf   = $ENV{'AUTOCONF'}   || ($ENV{'STAGING_DIR'} ? 
> $ENV{'STAGING_DIR'} . '/../host/bin/@autoconf-name@' : 
> '@bindir@/@autoconf-name@');
> -+my $autoheader = $ENV{'AUTOHEADER'} || ($ENV{'STAGING_DIR'} ? 
> $ENV{'STAGING_DIR'} . '/../host/bin/@autoheader-name@' : 
> '@bindir@/@autoheader-name@');
> -+my $autom4te   = $ENV{'AUTOM4TE'}   || ($ENV{'STAGING_DIR'} ? 
> $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : 
> '@bindir@/@autom4te-name@');
> - my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
> - my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
> - my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
> +-my $autoconf    = $ENV{'AUTOCONF'}    || '@bindir@/@autoconf-name@';
> +-my $autoheader  = $ENV{'AUTOHEADER'}  || 
> '@bindir@/@autoheader-name@';
> +-my $autom4te    = $ENV{'AUTOM4TE'}    || '@bindir@/@autom4te-name@';
> ++my $autoconf    = $ENV{'AUTOCONF'}    || ($ENV{'STAGING_DIR'} ? 
> $ENV{'STAGING_DIR'} . '/../host/bin/@autoconf-name@' : 
> '@bindir@/@autoconf-name@');
> ++my $autoheader  = $ENV{'AUTOHEADER'}  || ($ENV{'STAGING_DIR'} ? 
> $ENV{'STAGING_DIR'} . '/../host/bin/@autoheader-name@' : 
> '@bindir@/@autoheader-name@');
> ++my $autom4te    = $ENV{'AUTOM4TE'}    || ($ENV{'STAGING_DIR'} ? 
> $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : 
> '@bindir@/@autom4te-name@');
> + my $automake    = $ENV{'AUTOMAKE'}    || 'automake';
> + my $aclocal     = $ENV{'ACLOCAL'}     || 'aclocal';
> + my $libtoolize  = $ENV{'LIBTOOLIZE'}  || 'libtoolize';
>  --- a/bin/autoscan.in
>  +++ b/bin/autoscan.in
> -@@ -1,4 +1,4 @@
> --#! @PERL@ -w
> -+#! @PERL@
> - # -*- perl -*-
> - # @configure_input@
> -
> -@@ -23,9 +23,12 @@
> - eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" 
> "$@";; esac'
> -     if 0;
> +@@ -27,9 +27,12 @@ use 5.006;
> + use strict;
> + use warnings FATAL => 'all';
> 
>  +$^W = 1;
>  +
> @@ -138,7 +122,7 @@
>     unshift @INC, $pkgdatadir;
> 
>     # Override SHELL.  On DJGPP SHELL may not be set to a shell
> -@@ -91,10 +94,10 @@ my $configure_scan = 'configure.scan';
> +@@ -94,10 +97,10 @@ my %needed_macros =
>   my $log;
> 
>   # Autoconf and lib files.
> @@ -153,15 +137,9 @@
>   # -----
>  --- a/bin/autoupdate.in
>  +++ b/bin/autoupdate.in
> -@@ -1,4 +1,4 @@
> --#! @PERL@ -w
> -+#! @PERL@
> - # -*- perl -*-
> - # @configure_input@
> -
> -@@ -24,9 +24,12 @@
> - eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" 
> "$@";; esac'
> -     if 0;
> +@@ -28,9 +28,12 @@ use 5.006;
> + use strict;
> + use warnings FATAL => 'all';
> 
>  +$^W = 1;
>  +
> @@ -173,7 +151,7 @@
>     unshift @INC, $pkgdatadir;
> 
>     # Override SHELL.  On DJGPP SHELL may not be set to a shell
> -@@ -50,10 +53,10 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin
> +@@ -54,10 +57,10 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin
>   my $autoconf = "$autom4te --language=autoconf";
>   # We need to find m4sugar.
>   my @prepend_include;
> @@ -188,12 +166,7 @@
>   # $HELP
>  --- a/bin/ifnames.in
>  +++ b/bin/ifnames.in
> -@@ -1,10 +1,12 @@
> --#! @PERL@ -w
> -+#! @PERL@
> - # -*- perl -*-
> - # @configure_input@
> -
> +@@ -5,6 +5,8 @@
>   eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" 
> "$@";; esac'
>       if 0;
> 
> @@ -201,8 +174,8 @@
>  +
>   # ifnames - print the identifiers used in C preprocessor 
> conditionals
> 
> - # Copyright (C) 1994-1995, 1999-2003, 2005-2012 Free Software
> -@@ -31,7 +33,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
> + # Copyright (C) 1994-1995, 1999-2003, 2005-2017, 2020 Free Software
> +@@ -35,7 +37,8 @@ use warnings FATAL => 'all';
> 
>   BEGIN
>   {
> @@ -214,7 +187,7 @@
>     # Override SHELL.  On DJGPP SHELL may not be set to a shell
>  --- a/bin/autoconf.as
>  +++ b/bin/autoconf.as
> -@@ -84,7 +84,11 @@ exit_missing_arg='
> +@@ -89,7 +89,11 @@ exit_missing_arg='
>   # restore font-lock: '
> 
>   # Variables.
> @@ -224,6 +197,6 @@
>  +else
>  +	: ${AUTOM4TE='@bindir@/@autom4te-name@'}
>  +fi
> + : ${trailer_m4='@pkgdatadir@/autoconf/trailer.m4'}
>   autom4te_options=
>   outfile=
> - verbose=false
> diff --git a/tools/autoconf/patches/001-no_emacs_lib.patch 
> b/tools/autoconf/patches/001-no_emacs_lib.patch
> deleted file mode 100644
> index 35c51642e8..0000000000
> --- a/tools/autoconf/patches/001-no_emacs_lib.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> ---- a/lib/Makefile.am
> -+++ b/lib/Makefile.am
> -@@ -15,7 +15,7 @@
> - # You should have received a copy of the GNU General Public License
> - # along with this program.  If not, see 
> <http://www.gnu.org/licenses/>.
> -
> --SUBDIRS = Autom4te m4sugar autoconf autotest autoscan emacs
> -+SUBDIRS = Autom4te m4sugar autoconf autotest autoscan
> - nodist_pkgdata_DATA = autom4te.cfg
> - EXTRA_DIST = autom4te.in freeze.mk
> -
> ---- a/lib/Makefile.in
> -+++ b/lib/Makefile.in
> -@@ -225,7 +225,7 @@ target_alias = @target_alias@
> - top_build_prefix = @top_build_prefix@
> - top_builddir = @top_builddir@
> - top_srcdir = @top_srcdir@
> --SUBDIRS = Autom4te m4sugar autoconf autotest autoscan emacs
> -+SUBDIRS = Autom4te m4sugar autoconf autotest autoscan
> - nodist_pkgdata_DATA = autom4te.cfg
> - EXTRA_DIST = autom4te.in freeze.mk
> - edit = sed \
> diff --git a/tools/autoconf/patches/002-musl_host_fixup.patch 
> b/tools/autoconf/patches/002-musl_host_fixup.patch
> deleted file mode 100644
> index 4dcb1ec3c1..0000000000
> --- a/tools/autoconf/patches/002-musl_host_fixup.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> ---- a/build-aux/config.sub
> -+++ b/build-aux/config.sub
> -@@ -122,9 +122,9 @@ esac
> - # Here we must recognize all the valid KERNEL-OS combinations.
> - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
> - case $maybe_os in
> --  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | 
> linux-newlib* | \
> --  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | 
> \
> --  knetbsd*-gnu* | netbsd*-gnu* | \
> -+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | 
> linux-musl* | \
> -+  linux-newlib* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
> -+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
> -   kopensolaris*-gnu* | \
> -   storm-chaos* | os2-emx* | rtmk-nova*)
> -     os=-$maybe_os
> -@@ -1360,7 +1360,7 @@ case $os in
> - 	      | -chorusos* | -chorusrdb* | -cegcc* \
> - 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | 
> -rtems* \
> - 	      | -mingw32* | -linux-gnu* | -linux-android* \
> --	      | -linux-newlib* | -linux-uclibc* \
> -+	      | -linux-musl* | -linux-newlib* | -linux-uclibc* \
> - 	      | -uxpv* | -beos* | -mpeix* | -udk* \
> - 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | 
> -opened* \
> - 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
> --
> 2.29.2
> 
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff mbox series

Patch

diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile
index 6eb64d77d5..0fac14a6be 100644
--- a/tools/autoconf/Makefile
+++ b/tools/autoconf/Makefile
@@ -7,11 +7,11 @@ 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=autoconf
-PKG_VERSION:=2.69
+PKG_VERSION:=2.70
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/autoconf
-PKG_HASH:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684
+PKG_HASH:=fa9e227860d9d845c0a07f63b88c8d7a2ae1aa2345fb619384bb8accc19fecc6
 
 include $(INCLUDE_DIR)/host-build.mk
 
diff --git a/tools/autoconf/patches/000-relocatable.patch b/tools/autoconf/patches/000-relocatable.patch
index 12e94ae9a1..930fdd880d 100644
--- a/tools/autoconf/patches/000-relocatable.patch
+++ b/tools/autoconf/patches/000-relocatable.patch
@@ -1,6 +1,6 @@ 
 --- a/bin/autoheader.in
 +++ b/bin/autoheader.in
-@@ -28,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+@@ -32,7 +32,8 @@ use warnings FATAL => 'all';
  
  BEGIN
  {
@@ -10,32 +10,27 @@ 
    unshift @INC, "$pkgdatadir";
  
    # Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -50,7 +51,7 @@ use strict;
- use vars qw ($config_h %verbatim %symbol);
+@@ -54,7 +55,7 @@ use Autom4te::XFile;
+ our ($config_h, %symbol, %verbatim);
  
  # Lib files.
 -my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
 +my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
- local $config_h;
  my $config_h_in;
  my @prepend_include;
+ my @include;
 --- a/bin/autom4te.in
 +++ b/bin/autom4te.in
-@@ -1,10 +1,12 @@
--#! @PERL@ -w
-+#! @PERL@
- # -*- perl -*-
- # @configure_input@
- 
+@@ -5,6 +5,8 @@
  eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
      if 0;
  
 +$^W = 1;
 +
  # autom4te - Wrapper around M4 libraries.
- # Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc.
- 
-@@ -24,7 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ # Copyright (C) 2001-2003, 2005-2017, 2020 Free Software Foundation,
+ # Inc.
+@@ -28,7 +30,8 @@ use warnings FATAL => 'all';
  
  BEGIN
  {
@@ -45,8 +40,8 @@ 
    unshift @INC, $pkgdatadir;
  
    # Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -44,7 +47,8 @@ use File::Basename;
- use strict;
+@@ -48,7 +51,8 @@ use Autom4te::General;
+ use Autom4te::XFile;
  
  # Data directory.
 -my $pkgdatadir = $ENV{'AC_MACRODIR'} || '@pkgdatadir@';
@@ -55,7 +50,7 @@ 
  
  # $LANGUAGE{LANGUAGE} -- Automatic options for LANGUAGE.
  my %language;
-@@ -87,7 +91,7 @@ my @include;
+@@ -91,7 +95,7 @@ my @include;
  my $freeze = 0;
  
  # $M4.
@@ -64,7 +59,7 @@ 
  # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
  fatal "need GNU m4 1.4 or later: $m4"
    if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
-@@ -269,6 +273,12 @@ sub load_configuration ($)
+@@ -272,6 +276,12 @@ sub load_configuration ($)
  
        my @words = shellwords ($_);
        my $type = shift @words;
@@ -79,22 +74,17 @@ 
  	  fatal "$file:$.: end-language missing for: $lang"
 --- a/bin/autoreconf.in
 +++ b/bin/autoreconf.in
-@@ -1,10 +1,12 @@
--#! @PERL@ -w
-+#! @PERL@
- # -*- perl -*-
- # @configure_input@
- 
+@@ -5,6 +5,8 @@
  eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
      if 0;
  
 +$^W = 1;
 +
  # autoreconf - install the GNU Build System in a directory tree
- # Copyright (C) 1994, 1999-2012 Free Software Foundation, Inc.
- 
-@@ -26,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ # Copyright (C) 1994, 1999-2017, 2020 Free Software Foundation, Inc.
  
+@@ -31,7 +33,8 @@ use warnings FATAL => 'all';
+ my $buildauxdir;
  BEGIN
  {
 -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
@@ -102,31 +92,25 @@ 
 +	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
    unshift @INC, $pkgdatadir;
  
-   # Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -106,9 +109,9 @@ Written by David J. MacKenzie and Akim D
+   $buildauxdir = $ENV{'autom4te_buildauxdir'} || $pkgdatadir . '/build-aux';
+@@ -116,9 +119,9 @@ Written by David J. MacKenzie and Akim D
  ";
  
  # Lib files.
--my $autoconf   = $ENV{'AUTOCONF'}   || '@bindir@/@autoconf-name@';
--my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
--my $autom4te   = $ENV{'AUTOM4TE'}   || '@bindir@/@autom4te-name@';
-+my $autoconf   = $ENV{'AUTOCONF'}   || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoconf-name@' : '@bindir@/@autoconf-name@');
-+my $autoheader = $ENV{'AUTOHEADER'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoheader-name@' : '@bindir@/@autoheader-name@');
-+my $autom4te   = $ENV{'AUTOM4TE'}   || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
- my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
- my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
- my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
+-my $autoconf    = $ENV{'AUTOCONF'}    || '@bindir@/@autoconf-name@';
+-my $autoheader  = $ENV{'AUTOHEADER'}  || '@bindir@/@autoheader-name@';
+-my $autom4te    = $ENV{'AUTOM4TE'}    || '@bindir@/@autom4te-name@';
++my $autoconf    = $ENV{'AUTOCONF'}    || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoconf-name@' : '@bindir@/@autoconf-name@');
++my $autoheader  = $ENV{'AUTOHEADER'}  || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoheader-name@' : '@bindir@/@autoheader-name@');
++my $autom4te    = $ENV{'AUTOM4TE'}    || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
+ my $automake    = $ENV{'AUTOMAKE'}    || 'automake';
+ my $aclocal     = $ENV{'ACLOCAL'}     || 'aclocal';
+ my $libtoolize  = $ENV{'LIBTOOLIZE'}  || 'libtoolize';
 --- a/bin/autoscan.in
 +++ b/bin/autoscan.in
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @PERL@
- # -*- perl -*-
- # @configure_input@
- 
-@@ -23,9 +23,12 @@
- eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-     if 0;
+@@ -27,9 +27,12 @@ use 5.006;
+ use strict;
+ use warnings FATAL => 'all';
  
 +$^W = 1;
 +
@@ -138,7 +122,7 @@ 
    unshift @INC, $pkgdatadir;
  
    # Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -91,10 +94,10 @@ my $configure_scan = 'configure.scan';
+@@ -94,10 +97,10 @@ my %needed_macros =
  my $log;
  
  # Autoconf and lib files.
@@ -153,15 +137,9 @@ 
  # -----
 --- a/bin/autoupdate.in
 +++ b/bin/autoupdate.in
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @PERL@
- # -*- perl -*-
- # @configure_input@
- 
-@@ -24,9 +24,12 @@
- eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-     if 0;
+@@ -28,9 +28,12 @@ use 5.006;
+ use strict;
+ use warnings FATAL => 'all';
  
 +$^W = 1;
 +
@@ -173,7 +151,7 @@ 
    unshift @INC, $pkgdatadir;
  
    # Override SHELL.  On DJGPP SHELL may not be set to a shell
-@@ -50,10 +53,10 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin
+@@ -54,10 +57,10 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin
  my $autoconf = "$autom4te --language=autoconf";
  # We need to find m4sugar.
  my @prepend_include;
@@ -188,12 +166,7 @@ 
  # $HELP
 --- a/bin/ifnames.in
 +++ b/bin/ifnames.in
-@@ -1,10 +1,12 @@
--#! @PERL@ -w
-+#! @PERL@
- # -*- perl -*-
- # @configure_input@
- 
+@@ -5,6 +5,8 @@
  eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
      if 0;
  
@@ -201,8 +174,8 @@ 
 +
  # ifnames - print the identifiers used in C preprocessor conditionals
  
- # Copyright (C) 1994-1995, 1999-2003, 2005-2012 Free Software
-@@ -31,7 +33,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ # Copyright (C) 1994-1995, 1999-2003, 2005-2017, 2020 Free Software
+@@ -35,7 +37,8 @@ use warnings FATAL => 'all';
  
  BEGIN
  {
@@ -214,7 +187,7 @@ 
    # Override SHELL.  On DJGPP SHELL may not be set to a shell
 --- a/bin/autoconf.as
 +++ b/bin/autoconf.as
-@@ -84,7 +84,11 @@ exit_missing_arg='
+@@ -89,7 +89,11 @@ exit_missing_arg='
  # restore font-lock: '
  
  # Variables.
@@ -224,6 +197,6 @@ 
 +else
 +	: ${AUTOM4TE='@bindir@/@autom4te-name@'}
 +fi
+ : ${trailer_m4='@pkgdatadir@/autoconf/trailer.m4'}
  autom4te_options=
  outfile=
- verbose=false
diff --git a/tools/autoconf/patches/001-no_emacs_lib.patch b/tools/autoconf/patches/001-no_emacs_lib.patch
deleted file mode 100644
index 35c51642e8..0000000000
--- a/tools/autoconf/patches/001-no_emacs_lib.patch
+++ /dev/null
@@ -1,22 +0,0 @@ 
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -15,7 +15,7 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
--SUBDIRS = Autom4te m4sugar autoconf autotest autoscan emacs
-+SUBDIRS = Autom4te m4sugar autoconf autotest autoscan
- nodist_pkgdata_DATA = autom4te.cfg
- EXTRA_DIST = autom4te.in freeze.mk
- 
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -225,7 +225,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = Autom4te m4sugar autoconf autotest autoscan emacs
-+SUBDIRS = Autom4te m4sugar autoconf autotest autoscan
- nodist_pkgdata_DATA = autom4te.cfg
- EXTRA_DIST = autom4te.in freeze.mk
- edit = sed \
diff --git a/tools/autoconf/patches/002-musl_host_fixup.patch b/tools/autoconf/patches/002-musl_host_fixup.patch
deleted file mode 100644
index 4dcb1ec3c1..0000000000
--- a/tools/autoconf/patches/002-musl_host_fixup.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
---- a/build-aux/config.sub
-+++ b/build-aux/config.sub
-@@ -122,9 +122,9 @@ esac
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
--  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
--  knetbsd*-gnu* | netbsd*-gnu* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-musl* | \
-+  linux-newlib* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-@@ -1360,7 +1360,7 @@ case $os in
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-android* \
--	      | -linux-newlib* | -linux-uclibc* \
-+	      | -linux-musl* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \