Changeset 68d33bad

Timestamp:

Jul 26, 2010, 6:39:03 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

ba57c1e

Parents:

eaafb59

Message:

Updated M4 to 1.4.14.

Location:

BOOK

Files:

• final-system/common/m4.xml (modified) (1 diff)
• final-system/multilib/m4.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• temp-system/common/m4.xml (modified) (1 diff)
• temp-system/multilib/m4.xml (modified) (1 diff)

BOOK/final-system/common/m4.xml

@@ -24 +24 @@
   <sect2 role="installation">
     <title>Installation of M4</title>
+
+    <para os="s1">Add a missing include statement into one of the source files
+    with the following command:</para>
+
+<screen os="s2"><userinput>sed -i '/"m4.h"/i\#include &lt;sys/stat.h&gt;' src/path.c</userinput></screen>
 
     <para os="a">Prepare M4 for compilation:</para>

BOOK/final-system/multilib/m4.xml

@@ -22 +22 @@
     <title>Installation of M4</title>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>

BOOK/introduction/common/changelog.xml

@@ -40 +40 @@
       <para>July 26, 2010</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated M4 to 1.4.14.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated Gzip to 1.4.</para>

BOOK/packages.ent

@@ -267 +267 @@
 <!ENTITY linux-home "http://www.kernel.org">
 
-<!ENTITY m4-version "1.4.13">
-<!ENTITY m4-size "984 KB">
+<!ENTITY m4-version "1.4.14">
+<!ENTITY m4-size "1,100 KB">
 <!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.bz2">
-<!ENTITY m4-md5 "28f9ccd3ac4da45409251008b911d677">
+<!ENTITY m4-md5 "e6fb7d08d50d87e796069cff12a52a93">
 <!ENTITY m4-home "&gnu-software;m4">
 

BOOK/temp-system/common/m4.xml

@@ -37 +37 @@
 EOF</userinput></screen>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/m4.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+<screen os="s2"><userinput>cp src/path.c{,.orig}
+sed -e '/"m4.h"/i\#include &lt;sys/stat.h&gt;' \
+    src/path.c.orig > src/path.c</userinput></screen>
+
     <para os="a">Prepare M4 for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --cache-file=config.cache</userinput></screen>
 
     <para os="c">Compile the package:</para>

BOOK/temp-system/multilib/m4.xml

@@ -33 +33 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/m4.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"