diff options
| author | Alexey Neyman <stilor@att.net> | 2018-09-29 15:31:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 15:31:43 -0700 |
| commit | 68be6c2268dfee7c988a4e8d24a2d8caa8c32eda (patch) | |
| tree | 3ad6e813bd7b25460f069d5784b3510e0dabad29 | |
| parent | f74175ae1351589c653f5d34ad1a187d77d1b655 (diff) | |
| parent | 9ea66ee43fdee5352c627ae8e5db2e6e5ff3557b (diff) | |
| download | crosstool-ng-68be6c2268dfee7c988a4e8d24a2d8caa8c32eda.tar.gz crosstool-ng-68be6c2268dfee7c988a4e8d24a2d8caa8c32eda.tar.bz2 crosstool-ng-68be6c2268dfee7c988a4e8d24a2d8caa8c32eda.zip | |
Merge pull request #1043 from stilor/master
Fix older automake with newer Perl
| -rw-r--r-- | packages/automake/1.11.6/0000-escape-left-brace.patch | 27 | ||||
| -rw-r--r-- | packages/automake/1.14.1/0000-escape-left-brace.patch | 27 |
2 files changed, 54 insertions, 0 deletions
diff --git a/packages/automake/1.11.6/0000-escape-left-brace.patch b/packages/automake/1.11.6/0000-escape-left-brace.patch new file mode 100644 index 00000000..128f871f --- /dev/null +++ b/packages/automake/1.11.6/0000-escape-left-brace.patch @@ -0,0 +1,27 @@ +commit 13f00eb4493c217269b76614759e452d8302955e +Author: Paul Eggert <eggert@cs.ucla.edu> +Date: Thu Mar 31 16:35:29 2016 -0700 + + automake: port to Perl 5.22 and later + + 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. + +--- + automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/automake.in ++++ b/automake.in +@@ -4156,7 +4156,7 @@ + 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; + } + diff --git a/packages/automake/1.14.1/0000-escape-left-brace.patch b/packages/automake/1.14.1/0000-escape-left-brace.patch new file mode 100644 index 00000000..8a09d187 --- /dev/null +++ b/packages/automake/1.14.1/0000-escape-left-brace.patch @@ -0,0 +1,27 @@ +commit 13f00eb4493c217269b76614759e452d8302955e +Author: Paul Eggert <eggert@cs.ucla.edu> +Date: Thu Mar 31 16:35:29 2016 -0700 + + automake: port to Perl 5.22 and later + + 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. + +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3872,7 +3872,7 @@ + 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; + } + |