Changeset 026bb5d for BOOK/final-system/multilib/eglibc.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/multilib/eglibc.xml (modified) (4 diffs)

BOOK/final-system/multilib/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='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -69 +69 @@
 <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 \
-    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
+    --disable-profile --enable-kernel=2.6.32 \
+    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
+    --enable-obsolete-rpc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -88 +89 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-    <para os="l1">In multilib, we tend to think that compiling for
+    <para os="l1b">In multilib, we tend to think that compiling for
     <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
     cross-compiling. EGLIBC takes the traditional view that if you are building
@@ -96 +97 @@
     sed allows these tests to succeed:</para>
 
-<screen os="l2"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
+<screen os="l2b"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"