[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-sysvinit-371-g16e8ba1

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, sysvinit has been updated
       via  16e8ba11915b45740615468b29286b6246a29a6b (commit)
      from  bdf6b0780194025f4203f1149a36bb9b19e2bd48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 16e8ba11915b45740615468b29286b6246a29a6b
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Fri Jun 9 23:06:18 2017 -0500

    Add patch for automake and latest perl changes.

diff --git a/BOOK/final-system/common/automake.xml b/BOOK/final-system/common/automake.xml
index aabcd0d..b42a17f 100644
--- a/BOOK/final-system/common/automake.xml
+++ b/BOOK/final-system/common/automake.xml
@@ -27,6 +27,11 @@
 
     <para os="a">Prepare Automake for compilation:</para>
 
+    <para os="p1">Apply the following patch to fix outdated syntax that is no
+    longer recognized by Perl-&perl-version;.</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&automake-perl-patch;</userinput></screen>
+
 <screen os="b"><userinput>./configure \
     --prefix=/usr \
     --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
diff --git a/BOOK/final-system/multilib/automake.xml b/BOOK/final-system/multilib/automake.xml
index 22a4e2f..75e0ad8 100644
--- a/BOOK/final-system/multilib/automake.xml
+++ b/BOOK/final-system/multilib/automake.xml
@@ -25,6 +25,14 @@
     href="../common/automake.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/automake.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/automake.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
 <screen os="b"><userinput>CC="gcc ${BUILD64}" \
 ./configure \
     --prefix=/usr \
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index f66ccda..6985f3b 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -19,6 +19,16 @@
   <variablelist role="materials">
 
     <varlistentry>
+      <term>Automake Perl Patch - <token>&automake-perl-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&automake-perl-patch;"/></para>
+        <para>MD5 sum: <literal>&automake-perl-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+
+    <varlistentry>
       <term>Bash Branch Update Patch - <token>&bash-branch_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 5175674..f701cc4 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -4,6 +4,10 @@
 
 <!-- Start of Common Patches -->
 
+<!ENTITY automake-perl-patch "automake-&automake-version;-perl_5_26-1.patch">
+<!ENTITY automake-perl-patch-md5 "99dd9d0a31f4a51fbe77bbc13aa9d783">
+<!ENTITY automake-perl-patch-size "0.685 KB">
+
 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
 <!ENTITY bash-branch_update-patch-md5 "9f59bec94bfd1023d9c6a76b49187420">
 <!ENTITY bash-branch_update-patch-size "17 KB">
diff --git a/patches/automake-1.15-perl_5_26-1.patch b/patches/automake-1.15-perl_5_26-1.patch
new file mode 100644
index 0000000..59b6dfd
--- /dev/null
+++ b/patches/automake-1.15-perl_5_26-1.patch
@@ -0,0 +1,18 @@
+Submitted by: Chris Staub (chris at clfs dot org)
+Date: 2017-06-01
+Initial Package Version: 1.15
+Origin: https://patchwork.ozlabs.org/patch/735705/
+Description: Updates Automake to work with Perl 5.26
+
+diff -Naur automake-1.15.orig/bin/automake.in automake-1.15/bin/automake.in
+--- automake-1.15.orig/bin/automake.in	2015-01-05 14:25:55.000000000 -0500
++++ automake-1.15/bin/automake.in	2017-06-01 16:17:54.000000000 -0400
+@@ -3878,7 +3878,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;
+ }
+ 

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/automake.xml   |    5 +++++
 BOOK/final-system/multilib/automake.xml |    8 ++++++++
 BOOK/materials/common/patches.xml       |   10 ++++++++++
 BOOK/patches.ent                        |    4 ++++
 patches/automake-1.15-perl_5_26-1.patch |   18 ++++++++++++++++++
 5 files changed, 45 insertions(+), 0 deletions(-)
 create mode 100644 patches/automake-1.15-perl_5_26-1.patch


hooks/post-receive
-- 
Cross-LFS Book