Changeset 73ace20 for BOOK/final-system/ppc64

Timestamp:

Oct 10, 2012, 6:42:21 PM (14 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (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

Location:

BOOK/final-system/ppc64

Files:

• eglibc-64bit.xml (modified) (3 diffs)
• eglibc.xml (modified) (2 diffs)
• yaboot.xml (modified) (2 diffs)

BOOK/final-system/ppc64/eglibc-64bit.xml

@@ -40 +40 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -69 +69 @@
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
+    --disable-profile --enable-add-ons --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64</userinput></screen>
 
@@ -122 +122 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 

BOOK/final-system/ppc64/eglibc.xml

@@ -45 +45 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -85 +85 @@
 <screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
+    --disable-profile --enable-add-ons --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
 

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>