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

BOOK/cross-tools/common/eglibc.xml

@@ -27 +27 @@
     risk.</para>
 
-    <para os="db">Disable linking to <filename>libgcc_eh</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
 
-<screen os="dc"><userinput>cp -v Makeconfig{,.orig}
-sed -e 's/-lgcc_eh//g' Makeconfig.orig > Makeconfig</userinput></screen>
+    <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"
@@ -40 +43 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="dd">The following lines need to be added to
-    <filename>config.cache</filename> for EGLIBC to support NPTL:</para>
+    <para os="dd">Add the following to <filename>config.cache</filename>
+    to disable ssp when building EGLIBC:</para>
 
-<screen os="de"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
-libc_cv_forced_unwind=yes
-libc_cv_c_cleanup=yes
-libc_cv_gnu89_inline=yes
-libc_cv_ssp=no
-EOF</userinput></screen>
+<screen os="de"><userinput>echo "libc_cv_ssp=no" &gt; config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -58 +56 @@
     ../eglibc-&eglibc-version;/configure --prefix=/tools \
     --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
+    --disable-profile --with-tls --enable-kernel=2.6.32 \
+    --with-__thread --with-binutils=/cross-tools/bin \
+    --with-headers=/tools/include --enable-obsolete-rpc \
     --cache-file=config.cache</userinput></screen>
 
@@ -107 +105 @@
 
       <varlistentry os="dg6">
-        <term><parameter>--enable-add-ons</parameter></term>
-        <listitem>
-          <para>This tells EGLIBC to utilize all add-ons that are
-          available.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg7">
         <term><parameter>--with-tls</parameter></term>
         <listitem>
@@ -121 +111 @@
       </varlistentry>
 
-      <varlistentry os="dg8">
-        <term><parameter>--enable-kernel=2.6.0</parameter></term>
+      <varlistentry os="dg7">
+        <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>
 
-      <varlistentry os="dg9">
+      <varlistentry os="dg8">
         <term><parameter>--with-__thread</parameter></term>
         <listitem>
@@ -137 +127 @@
       </varlistentry>
 
-      <varlistentry os="dg10">
+      <varlistentry os="dg9">
         <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
         <listitem>
@@ -145 +135 @@
       </varlistentry>
 
-      <varlistentry os="dg11">
+      <varlistentry os="dg10">
         <term><parameter>--with-headers=/tools/include</parameter></term>
         <listitem>
@@ -155 +145 @@
       </varlistentry>
 
-      <varlistentry os="dg12">
+      <varlistentry os="dg11">
         <term><parameter>--cache-file=config.cache</parameter></term>
         <listitem>