Changeset 5375902a for BOOK

Timestamp:

May 17, 2014, 11:54:28 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

35d0341

Parents:

2264482 (diff), d3b105f (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 'sysvinit' of git.cross-lfs.org:cross-lfs into sysvinit

Location:

BOOK

Files:

• cross-tools/common/binutils-32.xml (modified) (2 diffs)
• cross-tools/common/binutils.xml (modified) (2 diffs)
• cross-tools/multilib/binutils.xml (modified) (2 diffs)
• final-system/common/util-linux.xml (modified) (1 diff)
• final-system/multilib/util-linux-64bit.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)

BOOK/cross-tools/common/binutils-32.xml

@@ -52 +52 @@
     --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
-    --disable-static --disable-multilib</userinput></screen>
+    --disable-static --disable-multilib --disable-werror</userinput></screen>
 
     <variablelist os="bd">
@@ -117 +117 @@
       </varlistentry>
 
+      <varlistentry os="bd8">
+        <term><parameter>--disable-werror</parameter></term>
+        <listitem>
+          <para>This prevents the build from stopping in the event that there
+          are warnings from theo host's compiler.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 

BOOK/cross-tools/common/binutils.xml

@@ -52 +52 @@
     --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
-    --disable-static --enable-64-bit-bfd --disable-multilib</userinput></screen>
+    --disable-static --enable-64-bit-bfd --disable-multilib --disable-werror</userinput></screen>
 
     <variablelist os="bd">
@@ -124 +124 @@
       </varlistentry>
 
+      <varlistentry os="bd9">
+        <term><parameter>--disble-werror</parameter></term>
+        <listitem>
+          <para>This prevents the build from stopping in the event that there
+          are warnings from the host's compiler.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 

BOOK/cross-tools/multilib/binutils.xml

@@ -51 +51 @@
     --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
-    --disable-nls --disable-static --enable-64-bit-bfd</userinput></screen>
+    --disable-nls --disable-static --enable-64-bit-bfd --disable-werror</userinput></screen>
 
     <variablelist os="bd">
@@ -82 +82 @@
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd8'])"/>
+      xpointer="xpointer(//*[@os='bd9'])"/>
 
     </variablelist>

BOOK/final-system/common/util-linux.xml

@@ -78 +78 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="i">Move the <command>logger</command> binary to
+    <filename class="directory">/bin</filename> as it is needed by the
+    CLFS Bootscripts package:</para>
+
+<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/util-linux-64bit.xml

@@ -65 +65 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 

BOOK/introduction/common/changelog.xml

@@ -41 +41 @@
       <itemizedlist>
         <listitem>
+          <para>[William Harrington] - Add --disable-werror to cross-tools
+          Bintuils instructions.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Move <command>logger</command> to
+          <filename class="directory">/bin</filename> for CLFS-Bootscripts
+          requirement.</para>
+        </listitem>
+        <listitem>
           <para>[Chris] - Changed "systemd" reference on Kbd page to
           CLFS Bootscripts, and added dumpkeys and kbd_mode to list of