Skip to content

Commit b930ce3

Browse files
zheshifandianAnsuel
authored andcommitted
tools/automake: bump to 1.17
refresh patch: 000-relocatable.patch 100-aclocal-skip-not-existing-directories.patch 101-do-not-require-files.patch 200-other-V-values-for-verbosity.patch Announcement:https://lists.gnu.org/archive/html/info-gnu/2021-01/msg00010.html Signed-off-by: Jack Sun <[email protected]> Link: openwrt/openwrt#17827 Signed-off-by: Christian Marangi <[email protected]>
1 parent abd424c commit b930ce3

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

tools/automake/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ include $(TOPDIR)/rules.mk
88

99
PKG_NAME:=automake
1010
PKG_CPE_ID:=cpe:/a:gnu:automake
11-
PKG_VERSION:=1.16.5
11+
PKG_VERSION:=1.17
1212
PKG_API_VERSION:=$(word 2,$(subst ., ,$(PKG_VERSION)))
1313

14-
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
14+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
1515
PKG_SOURCE_URL:=@GNU/automake
16-
PKG_HASH:=07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605
16+
PKG_HASH:=8920c1fc411e13b90bf704ef9db6f29d540e76d232cb3b2c9f4dc4cc599bd990
1717

1818
include $(INCLUDE_DIR)/host-build.mk
1919

2020
HOST_CONFIGURE_ARGS += \
2121
--disable-silent-rules
2222

2323
HOST_CONFIGURE_VARS += \
24-
PERL="/usr/bin/env perl" \
24+
PERL="$(shell command -v perl)" \
2525
am_cv_prog_PERL_ithreads=no
2626

2727
define Host/Configure

tools/automake/patches/000-relocatable.patch

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# We need at least this version for CLONE support.
1212
--- a/bin/aclocal.in
1313
+++ b/bin/aclocal.in
14-
@@ -23,9 +23,11 @@ use 5.006;
14+
@@ -23,10 +23,12 @@ use 5.006;
1515
use strict;
1616
use warnings FATAL => 'all';
1717

@@ -20,21 +20,23 @@
2020
BEGIN
2121
{
2222
- unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
23+
- unless $ENV{AUTOMAKE_UNINSTALLED};
2324
+ unshift (@INC, ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'))
24-
unless $ENV{AUTOMAKE_UNINSTALLED};
25+
+ unless $ENV{AUTOMAKE_UNINSTALLED};
2526
}
2627

28+
use File::Basename;
2729
@@ -65,8 +67,8 @@ $perl_threads = 0;
28-
# ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
29-
# option.
30+
# --aclocal-path option/ACLOCAL_PATH environment variable, and reset
31+
# with the '--system-acdir' option.
3032
my @user_includes = ();
3133
-my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
3234
-my @system_includes = ('@datadir@/aclocal');
3335
+my @automake_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . "/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION");
3436
+my @system_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/aclocal' : '@datadir@/aclocal');
37+
my $aclocal_path = '';
3538

3639
# Whether we should copy M4 file in $user_includes[0].
37-
my $install = 0;
3840
--- a/bin/automake.in
3941
+++ b/bin/automake.in
4042
@@ -26,9 +26,11 @@ use 5.006;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/bin/aclocal.in
22
+++ b/bin/aclocal.in
3-
@@ -371,6 +371,12 @@ sub scan_m4_dirs ($$@)
3+
@@ -372,6 +372,12 @@ sub scan_m4_dirs ($$@)
44

55
foreach my $m4dir (@dirlist)
66
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/bin/automake.in
22
+++ b/bin/automake.in
3-
@@ -4513,7 +4513,7 @@ sub handle_gettext ()
3+
@@ -4552,7 +4552,7 @@ sub handle_gettext ()
44
&& grep ($_ eq 'intl', @subdirs));
55
}
66

@@ -9,7 +9,7 @@
99
}
1010

1111
# Emit makefile footer.
12-
@@ -5641,7 +5641,7 @@ sub check_gnu_standards ()
12+
@@ -5677,7 +5677,7 @@ sub check_gnu_standards ()
1313
# otherwise require non-.md.
1414
my $required
1515
= (! -f $file && -f "$file.md") ? "$file.md" : $file;
@@ -18,7 +18,7 @@
1818
}
1919

2020
# Accept one of these three licenses; default to COPYING.
21-
@@ -5655,7 +5655,7 @@ sub check_gnu_standards ()
21+
@@ -5691,7 +5691,7 @@ sub check_gnu_standards ()
2222
last;
2323
}
2424
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Subject: [PATCH] Allow other V values for verbosity
99

1010
--- a/m4/silent.m4
1111
+++ b/m4/silent.m4
12-
@@ -43,7 +43,7 @@ else
13-
fi])
12+
@@ -53,7 +53,7 @@ case $enable_silent_rules in @%:@ (((
13+
esac
1414
if test $am_cv_make_support_nested_variables = yes; then
1515
dnl Using '$V' instead of '$(V)' breaks IRIX make.
1616
- AM_V='$(V)'

0 commit comments

Comments
 (0)