Mercurial > mxe-octave

annotate src/build-automake-1-perl-5.patch @ 4463:0234109dc9f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
default-octave: add dependency on sundials-ida * src/default-octave.mk ($(PKG)_DEPS): Include sundials-ida in the list.
author Mike Miller <mtmiller@octave.org>
date Fri, 01 Sep 2017 18:09:01 -0700
parents 2db2282dfe9a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4438
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
1 Patch based on https://git.savannah.gnu.org/cgit/automake.git/commit/?id=13f00eb4493c217269b76614759e452d8302955e
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
2
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
3 diff -ur automake-1.11.6.orig/automake.in automake-1.11.6/automake.in
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
4 --- automake-1.11.6.orig/automake.in 2017-07-28 12:50:12.519289500 -0400
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
5 +++ automake-1.11.6/automake.in 2017-07-28 12:56:27.565672500 -0400
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
6 @@ -4156,7 +4156,7 @@
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
7 sub substitute_ac_subst_variables ($)
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
8 {
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
9 my ($text) = @_;
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
10 - $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
11 + $text =~ s/\$[{]([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
12 return $text;
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
13 }
2db2282dfe9a build-auutomake: allow build using >= perl 5.22 (Bug #51594)
John D <john.donoghue@ieee.org>
parents:
diff changeset
14