-
Notifications
You must be signed in to change notification settings - Fork 133
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add patch files to corrected tool automake
- Loading branch information
Showing
2 changed files
with
52 additions
and
0 deletions.
There are no files selected for viewing
24 changes: 24 additions & 0 deletions
24
openwrt/tools/automake/patches/0002-port-to-perl-5.22-and-later.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
Without this change, Perl 5.22 complains "Unescaped left brace in | ||
regex is deprecated" and this is planned to become a hard error in | ||
Perl 5.26. See: | ||
http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern | ||
* bin/automake.in (substitute_ac_subst_variables): Escape left brace. | ||
|
||
Backported from: | ||
http://git.savannah.gnu.org/cgit/automake.git/commit/?id=13f00eb4493c217269b76614759e452d8302955e | ||
Original author: Paul Eggert <eggert@cs.ucla.edu> | ||
Signed-off-by: Adam Duskett <aduskett@gmail.com> | ||
|
||
diff --git a/bin/automake.in b/bin/automake.in | ||
index a3a0aa3..2c8f31e 100644 | ||
--- a/bin/automake.in | ||
+++ b/bin/automake.in | ||
@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker | ||
sub substitute_ac_subst_variables | ||
{ | ||
my ($text) = @_; | ||
- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; | ||
+ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; | ||
return $text; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
Disable manpages build and installation, seems the bundled version of | ||
help2man is somewhat old and breaks on modern distributions such as | ||
Fedora 20, as reported by Kanibal on IRC. | ||
|
||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> | ||
|
||
diff -Nura automake-1.14.1.orig/Makefile.in automake-1.14.1/Makefile.in | ||
--- automake-1.14.1.orig/Makefile.in 2014-09-10 18:40:57.554164448 -0300 | ||
+++ automake-1.14.1/Makefile.in 2014-09-10 18:42:01.050348068 -0300 | ||
@@ -3387,7 +3387,7 @@ | ||
check-am: all-am | ||
$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local | ||
check: check-am | ||
-all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(MANS) $(DATA) | ||
+all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA) | ||
installdirs: | ||
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(amdir)" "$(DESTDIR)$(automake_acdir)" "$(DESTDIR)$(automake_internal_acdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(pkgvdatadir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(system_acdir)" "$(DESTDIR)$(perllibdir)"; do \ | ||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | ||
@@ -3454,7 +3454,7 @@ | ||
install-dist_automake_internal_acDATA install-dist_docDATA \ | ||
install-dist_perllibDATA install-dist_pkgvdataDATA \ | ||
install-dist_scriptDATA install-dist_system_acDATA \ | ||
- install-info-am install-man install-nodist_perllibDATA | ||
+ install-info-am install-nodist_perllibDATA | ||
@$(NORMAL_INSTALL) | ||
$(MAKE) $(AM_MAKEFLAGS) install-data-hook | ||
install-dvi: install-dvi-am | ||
|