Changeset 0906e3c

Timestamp:

07/16/2021 03:45:08 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

3999c22

Parents:

9600ece (diff), f399737 (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:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/m4.xml (modified) (1 diff)
• chapter08/m4.xml (modified) (1 diff)

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <listitem>
+      <para>2021-07-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove modifications to m4 that are no longer needed.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-07-08</para>
       <itemizedlist>

chapter06/m4.xml

@@ -43 +43 @@
   <sect2 role="installation">
     <title>Installation of M4</title>
-
+<!--
     <para>First, make some fixes introduced by glibc-2.28:</para>
 
 <screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
 echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
-
+-->
     <para>Prepare M4 for compilation:</para>
 

chapter08/m4.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of M4</title>
-
+<!--
     <para>First, make some fixes required by glibc-2.28 and later:</para>
 
 <screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
 echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
-
+-->
     <para>Prepare M4 for compilation:</para>