Changeset 162e1b4 for BOOK/final-system

Timestamp:

Jan 20, 2012, 2:15:38 PM (13 years ago)

Author:

Jonathan Norman <jon@…>

Branches:

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

Children:

ff6796f

Parents:

91b8781 (diff), a5f7c53e (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:

Updated Yaboot to 1.3.17 for Master

Location:

BOOK/final-system

Files:

• ppc/yaboot.xml (modified) (1 diff)
• ppc64/yaboot.xml (modified) (2 diffs)

BOOK/final-system/ppc/yaboot.xml

@@ -31 +31 @@
 
 <screen os="b"><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
+
+    <para os="aa"> Prevent the build from failing due to warnings with
+    the following sed:</para>
+
+<screen os="ba"><userinput>sed -i 's%-Werror%%' Makefile</userinput></screen>
 
     <para os="c">Compile the package:</para>

BOOK/final-system/ppc64/yaboot.xml

@@ -24 +24 @@
     <para>Existing multilib distributions alter gcc to default to 32-bit
     output.  Because our gcc defaults to 64-bit, we need to pass appropriate
-    options to both the compiler and the linker.  The Makefile already
-    overrides any CC and ignores LDFLAGS in favour of its own variables, so we
-    need to use the following seds for a successful compile and install.</para>
+    options to both the compiler and the linker.  To prevent the build from
+    failing due to compiler warnings, the -Werror flag is removed.  The 
+    Makefile already overrides any CC and ignores LDFLAGS in favour of 
+    its own variables, so we need to use the following seds for a 
+    successful compile and install.</para>
 
 <screen><userinput>sed -i -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
+    -e "s/-Werror//" \
     -e "s/\(-Bstatic\)/-melf32ppclinux \1/" Makefile
 </userinput></screen>
@@ -41 +44 @@
           variable and inserts the flag to force <command>gcc</command> to
           create 32-bit code when compiling yaboot.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>"s/-Werror//"</parameter></term>
+        <listitem>
+          <para>This deletes the -Werror flag from the Makefile.</para>
         </listitem>
       </varlistentry>