Changeset 3999c22

Timestamp:

07/18/2021 03:45:11 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

dabd16b

Parents:

0906e3c (diff), ac9f395 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (1 diff)
• chapter08/chapter08.xml (modified) (2 diffs)
• chapter08/perl.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

appendices/dependencies.xml

@@ -2403 +2403 @@
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
-          <seg>Iana-Etc and Procps-ng</seg>
+          <seg>Iana-Etc, Less. and Procps-ng</seg>
         </seglistitem>
       </segmentedlist>

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <listitem>
+      <para>2021-07-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix test failures in perl-5.34.0 by building less before
+          perl and by patching perl for a problem highlighted by gdbm-1.20. Fixes
+          <ulink url="&lfs-ticket-root;4885">#4885</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-07-15</para>
       <itemizedlist>

chapter03/patches.xml

@@ -103 +103 @@
     </varlistentry>
 -->
+
+    <varlistentry>
+      <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry revision="sysv">
       <term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>

chapter08/chapter08.xml

@@ -54 +54 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
@@ -73 +74 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>

chapter08/perl.xml

@@ -41 +41 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
+
+    <para>First, apply a patch that fixes an issue highlighted by recent
+    versions of gdbm:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&perl-fix-patch;</userinput></screen>
 
     <para>This version of Perl now builds the Compress::Raw::Zlib and 

patches.ent

@@ -64 +64 @@
 <!ENTITY ninja-limit-jobs-patch-size "2.5 KB">
 -->
+
+<!ENTITY perl-fix-patch "perl-&perl-version;-upstream_fixes-1.patch">
+<!ENTITY perl-fix-patch-md5 "fb42558b59ed95ee00eb9f1c1c9b8056">
+<!ENTITY perl-fix-patch-size "1.6 KB">
+
 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">