[PATCH 3/4] autoconf: upgrade to 2.73

[Ross Burton <ross.burton@arm.com>]

man-host-perl.patch and autoreconf-exclude.patch are now upstream.

Remove a hunk from autotest-automake-result-format.patch that has no
purpose.

License-Update: postal address changed.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../autoconf/autoreconf-exclude.patch         | 121 ------------------
 .../autotest-automake-result-format.patch     |  15 ---
 .../autoconf/autoconf/man-host-perl.patch     |  31 -----
 .../{autoconf_2.72.bb => autoconf_2.73.bb}    |  19 +--
 4 files changed, 7 insertions(+), 179 deletions(-)
 delete mode 100644 meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
 delete mode 100644 meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch
 rename meta/recipes-devtools/autoconf/{autoconf_2.72.bb => autoconf_2.73.bb} (81%)

diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
deleted file mode 100644
index 28141962008..00000000000
--- a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 1a50157aa11da48921200a0d8d4308863716eab0 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Thu, 12 Mar 2020 17:25:23 +0000
-Subject: [PATCH] autoreconf-exclude.patch
-
-Upstream-Status: Inappropriate [oe specific]
-
----
- bin/autoreconf.in | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/bin/autoreconf.in b/bin/autoreconf.in
-index 98ebab6..937f758 100644
---- a/bin/autoreconf.in
-+++ b/bin/autoreconf.in
-@@ -83,6 +83,7 @@ Operation modes:
-   -i, --install            copy missing standard auxiliary files
-       --no-recursive       don't rebuild sub-packages
-   -s, --symlink            with -i, install symbolic links instead of copies
-+  -x, --exclude=STEPS      steps we should not run
-   -m, --make               when applicable, re-run ./configure && make
-   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY
-                            (comma-separated list accepted)
-@@ -141,6 +142,10 @@ my $run_make = 0;
- # Recurse into subpackages
- my $recursive = 1;
- 
-+# Steps to exclude
-+my @exclude;
-+my @ex;
-+
- ## ---------- ##
- ## Routines.  ##
- ## ---------- ##
-@@ -161,6 +166,7 @@ sub parse_args ()
- 	  'B|prepend-include=s'	 => \@prepend_include,
- 	  'i|install'            => \$install,
- 	  's|symlink'            => \$symlink,
-+  	  'x|exclude=s'          => \@exclude,
- 	  'm|make'               => \$run_make,
- 	  'recursive!'           => \$recursive);
- 
-@@ -170,6 +176,8 @@ sub parse_args ()
-   parse_WARNINGS;
-   parse_warnings @warning;
- 
-+  @exclude = map { split /,/ } @exclude;
-+
-   # Even if the user specified a configure.ac, trim to get the
-   # directory, and look for configure.ac again.  Because (i) the code
-   # is simpler, and (ii) we are still able to diagnose simultaneous
-@@ -493,8 +501,11 @@ sub autoreconf_current_directory ($)
-     }
-   else
-     {
-+      @ex = grep (/^autopoint$/, @exclude);
-+      if ($#ex == -1) {
-       xsystem_hint ("autopoint is needed because this package uses Gettext",
-                     $autopoint);
-+      }
-     }
- 
- 
-@@ -691,9 +702,12 @@ sub autoreconf_current_directory ($)
- 	{
- 	  $libtoolize .= " --ltdl";
- 	}
-+      @ex = grep (/^libtoolize$/, @exclude);
-+      if ($#ex == -1) {
-       xsystem_hint ("libtoolize is needed because this package uses Libtool",
- 		    $libtoolize);
-       $rerun_aclocal = 1;
-+      }
-     }
-   else
-     {
-@@ -730,8 +744,11 @@ sub autoreconf_current_directory ($)
-     }
-   elsif ($install)
-     {
-+      @ex = grep (/^gtkdocize$/, @exclude);
-+      if ($#ex == -1) {
-       xsystem_hint ("gtkdocize is needed because this package uses Gtkdoc",
- 		    $gtkdocize);
-+      }
-     }
-   else
-     {
-@@ -769,7 +786,10 @@ sub autoreconf_current_directory ($)
-   # latter runs the former, and (ii) autoconf is stricter than
-   # autoheader.  So all in all, autoconf should give better error
-   # messages.
-+  @ex = grep (/^autoconf$/, @exclude);
-+  if ($#ex == -1) {
-   xsystem ($autoconf);
-+  }
- 
- 
-   # -------------------- #
-@@ -790,7 +810,10 @@ sub autoreconf_current_directory ($)
-     }
-   else
-     {
-+      @ex = grep (/^autoheader$/, @exclude);
-+      if ($#ex == -1) {
-       xsystem ($autoheader);
-+      }
-     }
- 
- 
-@@ -807,7 +830,10 @@ sub autoreconf_current_directory ($)
-       # We should always run automake, and let it decide whether it shall
-       # update the file or not.  In fact, the effect of '$force' is already
-       # included in '$automake' via '--no-force'.
-+      @ex = grep (/^automake$/, @exclude);
-+      if ($#ex == -1) {
-       xsystem ($automake);
-+      }
-     }
- 
-   # ---------------------------------------------------- #
diff --git a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
index 38725574bac..d88e16b52fb 100644
--- a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
@@ -34,21 +34,6 @@ index bf18866..8097523 100644
      [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]])
  	at_fn_validate_ranges at_option
  	AS_VAR_APPEND([at_groups], ["$at_option$as_nl"])
-@@ -728,10 +735,10 @@ m4_divert_push([HELP_MODES])dnl
- cat <<_ATEOF || at_write_fail=1
- 
- Operation modes:
--  -h, --help     print the help message, then exit
--  -V, --version  print version number, then exit
--  -c, --clean    remove all the files this test suite might create and exit
--  -l, --list     describes all the tests, or the selected TESTS
-+  -h, --help      print the help message, then exit
-+  -V, --version   print version number, then exit
-+  -c, --clean     remove all the files this test suite might create and exit
-+  -l, --list      describes all the tests, or the selected TESTS
- _ATEOF
- m4_divert_pop([HELP_MODES])dnl
- m4_wrap([m4_divert_push([HELP_TUNING_BEGIN])dnl
 @@ -757,6 +764,7 @@ Execution tuning:
    -d, --debug    inhibit clean up and top-level logging
  [                 default for debugging scripts]
diff --git a/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch b/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch
deleted file mode 100644
index 0f49583a641..00000000000
--- a/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1c033f2a23941c46d88b9ac279f87bf2c6e99499 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Wed, 15 Jul 2020 16:03:21 +0100
-Subject: [PATCH] Don't use the target perl when regenerating the man pages.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
----
- man/local.mk | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/man/local.mk b/man/local.mk
-index 775c131..ba94753 100644
---- a/man/local.mk
-+++ b/man/local.mk
-@@ -77,13 +77,12 @@ SUFFIXES += .w .1
- 	@echo "Updating man page $@"
- 	$(MKDIR_P) $(@D)
- 	PATH="$(top_srcdir)/man$(PATH_SEPARATOR)$$PATH"; \
--	PERL="$(PERL)"; \
- 	PACKAGE_NAME="$(PACKAGE_NAME)"; \
- 	VERSION="$(VERSION)"; \
- 	RELEASE_YEAR="$(RELEASE_YEAR)"; \
- 	top_srcdir="$(top_srcdir)"; \
- 	channeldefs_pm="$(channeldefs_pm)"; \
--	export PATH PERL PACKAGE_NAME VERSION RELEASE_YEAR; \
-+	export PATH PACKAGE_NAME VERSION RELEASE_YEAR; \
- 	export top_srcdir channeldefs_pm; \
- 	$(HELP2MAN) \
- 	    --include=$(srcdir)/$*.x \
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.72.bb b/meta/recipes-devtools/autoconf/autoconf_2.73.bb
similarity index 81%
rename from meta/recipes-devtools/autoconf/autoconf_2.72.bb
rename to meta/recipes-devtools/autoconf/autoconf_2.73.bb
index b599f270c79..2dd8fb27721 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.72.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.73.bb
@@ -8,27 +8,22 @@ SECTION = "devel"
 DEPENDS = "m4-native autoconf-native automake-native gnu-config-native help2man-native"
 DEPENDS:remove:class-native = "autoconf-native automake-native help2man-native"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=cc3f3a7596cb558bbd9eb7fbaa3ef16c \
+LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \
 		    file://COPYINGv3;md5=1ebbd3e34237af26da5dc08a4e440464"
 
 SRC_URI = " \
            ${GNU_MIRROR}/autoconf/${BP}.tar.gz \
            file://program_prefix.patch \
-           file://autoreconf-exclude.patch \
            file://remove-usr-local-lib-from-m4.patch \
            file://preferbash.patch \
            file://autotest-automake-result-format.patch \
-           file://man-host-perl.patch \
 "
 SRC_URI:append:class-native = " file://no-man.patch"
 
-SRC_URI[sha256sum] = "afb181a76e1ee72832f6581c0eddf8df032b83e2e0239ef79ebedc4467d92d6e"
+SRC_URI[sha256sum] = "259ddfa3bddc799cfb81489cc0f17dfdf1bd6d1505dda53c0f45ff60d6a4f9a7"
 
-# Remove this when upgrading past 2.72, as package managers sort 2.72e (the
-# fifth release candidate) after 2.72.
-PKGV = "2.72e+really${PV}"
-
-RDEPENDS:${PN} = "m4 gnu-config \
+RDEPENDS:${PN} = "m4 \
+		  gnu-config \
 		  perl \
 		  perl-module-bytes \
 		  perl-module-carp \
@@ -45,13 +40,13 @@ RDEPENDS:${PN} = "m4 gnu-config \
 		  perl-module-file-spec \
 		  perl-module-file-spec-unix \
 		  perl-module-file-stat \
-                  perl-module-file-temp \
+		  perl-module-file-temp \
 		  perl-module-getopt-long \
 		  perl-module-io-file \
-                  perl-module-list-util \
+		  perl-module-list-util \
 		  perl-module-overloading \
 		  perl-module-posix \
-                  perl-module-scalar-util \
+		  perl-module-scalar-util \
 		  perl-module-symbol \
 		  perl-module-thread-queue \
 		  perl-module-threads \
-- 
2.43.0