domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/automake: update to 1.17

Browse Source 
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>
This commit is contained in:
Michael Pratt
2025-05-11 03:06:41 -04:00
committed by Robert Marko
parent 793be94a3a
commit 03b9b7e894
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/automake/Makefile
View File

@@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=automake PKG_NAME:=automake
PKG_CPE_ID:=cpe:/a:gnu: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_API_VERSION:=$(word 2,$(subst ., ,$(PKG_VERSION)))
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/automake PKG_SOURCE_URL:=@GNU/automake
PKG_HASH:=07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605 PKG_HASH:=397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk

10
tools/automake/patches/000-relocatable.patch
View File

@@ -16,7 +16,7 @@
+#!/usr/bin/env perl +#!/usr/bin/env perl
# aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*- # aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*-
# @configure_input@ # @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; @@ -23,9 +23,11 @@ use 5.006;
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
@@ -31,16 +31,16 @@
} }
@@ -65,8 +67,8 @@ $perl_threads = 0; @@ -65,8 +67,8 @@ $perl_threads = 0;
# ACLOCAL_PATH environment variable, and reset with the '--system-acdir' # --aclocal-path option/ACLOCAL_PATH environment variable, and reset
# option. # with the '--system-acdir' option.
my @user_includes = (); my @user_includes = ();
-my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION); -my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
-my @system_includes = ('@datadir@/aclocal'); -my @system_includes = ('@datadir@/aclocal');
+my @automake_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . "/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION"); +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 @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]. # Whether we should copy M4 file in $user_includes[0].
my $install = 0;
--- a/bin/automake.in --- a/bin/automake.in
+++ b/bin/automake.in +++ b/bin/automake.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@@ -48,7 +48,7 @@
+#!/usr/bin/env perl +#!/usr/bin/env perl
# automake - create Makefile.in from Makefile.am -*- perl -*- # automake - create Makefile.in from Makefile.am -*- perl -*-
# @configure_input@ # @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; @@ -26,9 +26,11 @@ use 5.006;
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';

2
tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
View File

@@ -1,6 +1,6 @@
--- a/bin/aclocal.in --- a/bin/aclocal.in
+++ b/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) foreach my $m4dir (@dirlist)
{ {

6
tools/automake/patches/101-do-not-require-files.patch
View File

@@ -1,6 +1,6 @@
--- a/bin/automake.in --- a/bin/automake.in
+++ b/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)); && grep ($_ eq 'intl', @subdirs));
} }
@@ -9,7 +9,7 @@
} }
# Emit makefile footer. # Emit makefile footer.
@@ -5641,7 +5641,7 @@ sub check_gnu_standards () @@ -5677,7 +5677,7 @@ sub check_gnu_standards ()
# otherwise require non-.md. # otherwise require non-.md.
my $required my $required
= (! -f $file && -f "$file.md") ? "$file.md" : $file; = (! -f $file && -f "$file.md") ? "$file.md" : $file;
@@ -18,7 +18,7 @@
} }
# Accept one of these three licenses; default to COPYING. # 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; last;
} }
} }

4
tools/automake/patches/200-other-V-values-for-verbosity.patch
View File

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