tools/automake: update to 1.17

Update to the latest stable release.

This is the automake API that newer packages
such as libtool 2.5.4 is bootstrapped with,
and is required for bootstrapping it again.

Manually Adjusted:
 - 000-relocatable.patch

All other patches are automatically refreshed.

Link: https://lists.gnu.org/archive/html/autotools-announce/2024-07/msg00000.html
Signed-off-by: Michael Pratt <mcpratt@pm.me>
Link: https://github.com/openwrt/openwrt/pull/16522
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index b698dd5a712d87b20ad6e1ceb90dea47e0a5e855..f281583f054d404788213c16deb69666b38b2f20 100644 (file)
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=automake
 PKG_CPE_ID:=cpe:/a:gnu:automake
-PKG_VERSION:=1.16.5
+PKG_VERSION:=1.17
 PKG_API_VERSION:=$(word 2,$(subst ., ,$(PKG_VERSION)))
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/automake
-PKG_HASH:=07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605
+PKG_HASH:=397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd
 
 include $(INCLUDE_DIR)/host-build.mk
 

diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch
index 7d62435cb2885342e6e85ce3c131c181c9c8b6b4..d3a9e178e434505cf1592253949b20d105be3029 100644 (file)
--- a/tools/automake/patches/000-relocatable.patch
+++ b/tools/automake/patches/000-relocatable.patch
@@ -16,7 +16,7 @@
 +#!/usr/bin/env perl
  # aclocal - create aclocal.m4 by scanning configure.ac      -*- perl -*-
  # @configure_input@
- # Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2024 Free Software Foundation, Inc.
 @@ -23,9 +23,11 @@ use 5.006;
  use strict;
  use warnings FATAL => 'all';
@@ -31,16 +31,16 @@
  }
  
 @@ -65,8 +67,8 @@ $perl_threads = 0;
- # ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
- # option.
+ # --aclocal-path option/ACLOCAL_PATH environment variable, and reset
+ # with the '--system-acdir' option.
  my @user_includes = ();
 -my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
 -my @system_includes = ('@datadir@/aclocal');
 +my @automake_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . "/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION");
 +my @system_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/aclocal' : '@datadir@/aclocal');
+ my $aclocal_path = '';
  
  # Whether we should copy M4 file in $user_includes[0].
- my $install = 0;
 --- a/bin/automake.in
 +++ b/bin/automake.in
 @@ -1,4 +1,4 @@
@@ -48,7 +48,7 @@
 +#!/usr/bin/env perl
  # automake - create Makefile.in from Makefile.am            -*- perl -*-
  # @configure_input@
- # Copyright (C) 1994-2021 Free Software Foundation, Inc.
+ # Copyright (C) 1994-2024 Free Software Foundation, Inc.
 @@ -26,9 +26,11 @@ use 5.006;
  use strict;
  use warnings FATAL => 'all';

diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
index a0d04e21e5fdc437927bc76e8ab5b78997f855d3..6fa23c49e813c01c9f38941699a028c2be6de492 100644 (file)
--- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
+++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
@@ -1,6 +1,6 @@
 --- a/bin/aclocal.in
 +++ b/bin/aclocal.in
-@@ -371,6 +371,12 @@ sub scan_m4_dirs ($$@)
+@@ -372,6 +372,12 @@ sub scan_m4_dirs ($$@)
  
    foreach my $m4dir (@dirlist)
      {

diff --git a/tools/automake/patches/101-do-not-require-files.patch b/tools/automake/patches/101-do-not-require-files.patch
index 3a8c9fcb47b1ae2ff31eee0f59bb232c828d5aca..26847bc6808284539af7b8886277748131dc7352 100644 (file)
--- a/tools/automake/patches/101-do-not-require-files.patch
+++ b/tools/automake/patches/101-do-not-require-files.patch
@@ -1,6 +1,6 @@
 --- a/bin/automake.in
 +++ b/bin/automake.in
-@@ -4513,7 +4513,7 @@ sub handle_gettext ()
+@@ -4552,7 +4552,7 @@ sub handle_gettext ()
            && grep ($_ eq 'intl', @subdirs));
      }
  
@@ -9,7 +9,7 @@
  }
  
  # Emit makefile footer.
-@@ -5641,7 +5641,7 @@ sub check_gnu_standards ()
+@@ -5677,7 +5677,7 @@ sub check_gnu_standards ()
            # otherwise require non-.md.
            my $required
             = (! -f $file && -f "$file.md") ? "$file.md" : $file;
@@ -18,7 +18,7 @@
          }
  
        # Accept one of these three licenses; default to COPYING.
-@@ -5655,7 +5655,7 @@ sub check_gnu_standards ()
+@@ -5691,7 +5691,7 @@ sub check_gnu_standards ()
              last;
            }
        }

diff --git a/tools/automake/patches/200-other-V-values-for-verbosity.patch b/tools/automake/patches/200-other-V-values-for-verbosity.patch
index 1ea9d38b0ed1013a9ecaa4559d97132b30b29404..8a5a2d31bdb8587278b10ccc2ee964788df0588a 100644 (file)
--- a/tools/automake/patches/200-other-V-values-for-verbosity.patch
+++ b/tools/automake/patches/200-other-V-values-for-verbosity.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] Allow other V values for verbosity
 
 --- a/m4/silent.m4
 +++ b/m4/silent.m4
-@@ -43,7 +43,7 @@ else
- fi])
+@@ -53,7 +53,7 @@ case $enable_silent_rules in @%:@ (((
+ esac
  if test $am_cv_make_support_nested_variables = yes; then
    dnl Using '$V' instead of '$(V)' breaks IRIX make.
 -  AM_V='$(V)'