mirror of
https://github.com/cjdelisle/openwrt.git
synced 2025-05-12 10:03:05 +00:00
87f3365d90
This reverts commit b930ce3bf7.
Bump to 1.17 broke SDK portability as it partially reverted commit
("automake: portability fixes") which made Perl PATH "/usr/bin/env perl"
as that is portable, as otherwise automake will set the absolute path to
the Perl binary and this will then fail when using SDK on a different
system as that PATH is not present.
So, since fixing this would require backport of upstream commit
("configure: make perl path with whitespace a warning, not error.") which
requires autoreconf to be done in order for configure to get regenerated
we cannot do it because at that time we do not have automake built.
So, for now revert the bump until upstream makes a new release.
Signed-off-by: Robert Marko <robimarko@gmail.com>
30 lines
868 B
Diff
30 lines
868 B
Diff
--- a/bin/automake.in
|
|
+++ b/bin/automake.in
|
|
@@ -4513,7 +4513,7 @@ sub handle_gettext ()
|
|
&& grep ($_ eq 'intl', @subdirs));
|
|
}
|
|
|
|
- require_file ($ac_gettext_location, GNU, 'ABOUT-NLS');
|
|
+ require_file ($ac_gettext_location, GNITS, 'ABOUT-NLS');
|
|
}
|
|
|
|
# Emit makefile footer.
|
|
@@ -5641,7 +5641,7 @@ sub check_gnu_standards ()
|
|
# otherwise require non-.md.
|
|
my $required
|
|
= (! -f $file && -f "$file.md") ? "$file.md" : $file;
|
|
- require_file ("$am_file.am", GNU, $required);
|
|
+ require_file ("$am_file.am", GNITS, $required);
|
|
}
|
|
|
|
# Accept one of these three licenses; default to COPYING.
|
|
@@ -5655,7 +5655,7 @@ sub check_gnu_standards ()
|
|
last;
|
|
}
|
|
}
|
|
- require_file ("$am_file.am", GNU, 'COPYING')
|
|
+ require_file ("$am_file.am", GNITS, 'COPYING')
|
|
unless $license;
|
|
}
|
|
|