Changeset 026bb5d for BOOK/final-system/ppc64/yaboot.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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 simp branch to match main book

File:

• BOOK/final-system/ppc64/yaboot.xml (modified) (3 diffs)

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>
@@ -44 +47 @@
       </varlistentry>
       <varlistentry>
+        <term><parameter>"s/-Werror//"</parameter></term>
+        <listitem>
+          <para>This deletes the -Werror flag from the Makefile.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><parameter>"s/\(-Bstatic\)/-melf32ppclinux \1/"</parameter></term>
         <listitem>
@@ -54 +63 @@
 
     </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../ppc/yaboot.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../ppc/yaboot.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../ppc/yaboot.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../ppc/yaboot.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"