Changeset 2a8ab07

Timestamp:

Oct 25, 2012, 4:17:24 AM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

7c48514

Parents:

f7b2c72 (diff), f001dfd (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:

Merge branch 'master' of git.cross-lfs.org:cross-lfs

Files:

• BOOK/cross-tools/common/m4.xml (modified) (1 diff)
• BOOK/final-system/common/coreutils.xml (modified) (1 diff)
• BOOK/general.ent (modified) (1 diff)
• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/materials/common/patches.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• clfs-1.2.0 (deleted)
• patches/m4-1.4.16-no-gets-1.patch (added)

BOOK/cross-tools/common/m4.xml

@@ -23 +23 @@
     <title>Installation of M4</title>
 
+
+    <para os="p1">The following patch contains a fix when building 
+    with a host having glibc or eglibc 2.16 or later.</para>
+
+    <screen os="p2"><userinput>patch -Np1 -i ../&m4-gets-patch;</userinput></screen>
+
     <para os="a">Prepare M4 for compilation:</para>
 

BOOK/final-system/common/coreutils.xml

@@ -84 +84 @@
     <systemitem class="username">dummy</systemitem> user:</para>
 
-<screen os="o"><userinput>src/su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
+<screen os="o"><userinput>su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
 
     <para os="p">When testing is complete, remove the

BOOK/general.ent

@@ -3 +3 @@
 <!ENTITY month "10"> <!-- Use two digits -->
 <!ENTITY month_name "October">
-<!ENTITY day "15"> <!-- Use two digits -->
+<!ENTITY day "23"> <!-- Use two digits -->
 <!ENTITY year "2012"> <!-- Use four digits -->
 

BOOK/introduction/common/changelog.xml

@@ -37 +37 @@
 -->
     <listitem>
+      <para>October 23, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington} - Add cross-tools M4 patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 17, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington} - Edit coreutils test suite command for su.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+
+    <listitem>
       <para>October 15, 2012</para>
       <itemizedlist>

BOOK/materials/common/patches.xml

@@ -101 +101 @@
 
     <varlistentry>
+      <term>M4 gets Patch - <token>&m4-gets-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&m4-gets-patch;"/></para>
+        <para>MD5 sum: <literal>&m4-gets-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Man i18n Patch - <token>&man-i18n-patch-size;</token>:</term>
       <listitem>

BOOK/patches.ent

@@ -49 +49 @@
 <!ENTITY kbd-espo-patch-md5 "476c4066c5c663b44b67acaa4cdef62e">
 <!ENTITY kbd-espo-patch-size "4 KB">
+
+<!ENTITY m4-gets-patch "m4-&m4-version;-no-gets-1.patch">
+<!ENTITY m4-gets-patch-md5 "6c5013f9ae5afc78f123e96356ceec3e">
+<!ENTITY m4-gets-patch-size "4 KB">
 
 <!ENTITY man-i18n-patch "man-&man-version;-i18n-1.patch">