Changeset 229ed25 for BOOK/final-system/sparc64-64/eglibc.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

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

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

@@ -48 +48 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -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-kernel=2.6.32 \
     --libexecdir=/usr/lib/eglibc --libdir=/usr/lib \
-    --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -127 +135 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <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
-    this with the following:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
 
-    <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
 
   </sect2>