changeset 4438:2db2282dfe9a

build-auutomake: allow build using >= perl 5.22 (Bug #51594) * src/build-automake-1-perl-5.patch: new file * dist-files.mk: add ref to build-automake-1-perl-5.patch
author John D <john.donoghue@ieee.org>
date Fri, 28 Jul 2017 13:01:18 -0400
parents b5a0cf744756
children 966e35ba2610
files dist-files.mk src/build-automake-1-perl-5.patch
diffstat 2 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri Jul 28 12:43:56 2017 -0400
+++ b/dist-files.mk	Fri Jul 28 13:01:18 2017 -0400
@@ -20,6 +20,7 @@
   boost-test.cpp \
   boost.mk \
   build-autoconf.mk \
+  build-automake-1-perl-5.patch \
   build-automake.mk \
   build-binutils.mk \
   build-bison.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/build-automake-1-perl-5.patch	Fri Jul 28 13:01:18 2017 -0400
@@ -0,0 +1,14 @@
+Patch based on https://git.savannah.gnu.org/cgit/automake.git/commit/?id=13f00eb4493c217269b76614759e452d8302955e
+
+diff -ur automake-1.11.6.orig/automake.in automake-1.11.6/automake.in
+--- automake-1.11.6.orig/automake.in	2017-07-28 12:50:12.519289500 -0400
++++ automake-1.11.6/automake.in	2017-07-28 12:56:27.565672500 -0400
+@@ -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;
+ }
+