Changeset 73ace20 for BOOK/final-system/sparc64-64/eglibc.xml

Timestamp:

Oct 10, 2012, 6:42:21 PM (12 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

File:

• BOOK/final-system/sparc64-64/eglibc.xml (modified) (4 diffs)

BOOK/final-system/sparc64-64/eglibc.xml

@@ -41 +41 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -64 +72 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -75 +83 @@
 
 <screen os="h"><userinput>CC="gcc ${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/lib/eglibc --libdir=/usr/lib \
     --cache-file=config.cache</userinput></screen>
@@ -127 +135 @@
     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'])"/>
+
     <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
     and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix