Changeset 229ed25 for BOOK/cross-tools/alpha/eglibc-headers.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/cross-tools/alpha/eglibc-headers.xml (modified) (4 diffs)

BOOK/cross-tools/alpha/eglibc-headers.xml

@@ -23 +23 @@
     <title>Installation of EGLIBC Headers</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
+
     <para os="s1">EGLIBC's <filename>configure</filename> script checks the
     version of GCC, and will fail if it's less than 3.4. The next EGLIBC build
@@ -33 +37 @@
 <screen os="s2"><userinput>cp -v configure{,.orig}
 sed -e 's/3.4/3.[0-9]/g' configure.orig &gt; configure</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -61 +73 @@
 <screen os="s3"><userinput>CC=gcc ../eglibc-&eglibc-version;/configure --prefix=/tools \
    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-   --disable-sanity-checks --enable-kernel=2.6.0 \
-   --with-headers=/tools/include --cache-file=config.cache \
+   --disable-sanity-checks --enable-kernel=2.6.32 \
+   --with-headers=/tools/include --enable-obsolete-rpc \
+   --cache-file=config.cache \
    --with-binutils=/cross-tools/${CLFS_TARGET}/bin</userinput></screen>
 
@@ -113 +126 @@
 
        <varlistentry os="ca6">
-            <term><parameter>--enable-kernel=2.6.0</parameter></term>
+            <term><parameter>--enable-kernel=2.6.32</parameter></term>
             <listitem>
                <para>This tells EGLIBC to compile the library with support
-               for 2.6.x Linux kernels.</para>
+               for 2.6.32 and later Linux kernels.</para>
             </listitem>
        </varlistentry>