Changeset 71cd9de for BOOK/cross-tools

Timestamp:

Oct 17, 2015, 3:01:41 PM (9 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

master, systemd

Children:

9b4ea58

Parents:

e869c0f

Message:

Update GLIBC from 2.21 to 2.22 and remove rttldir from config.cache.

Location:

BOOK/cross-tools

Files:

• 64/glibc.xml (modified) (3 diffs)
• common/glibc.xml (modified) (3 diffs)
• mips64/glibc-n32.xml (modified) (1 diff)
• multilib/glibc-64bit.xml (modified) (1 diff)
• multilib/glibc.xml (modified) (3 diffs)
• sparc64-64/glibc.xml (modified) (1 diff)
• sparc64/glibc-64bit.xml (modified) (2 diffs)

BOOK/cross-tools/64/glibc.xml

@@ -37 +37 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -53 +45 @@
       --disable-profile --enable-kernel=&glibc-kernel-version; \
       --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-      --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+      --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="dg">
@@ -93 +85 @@
       href="../common/glibc.xml"
       xpointer="xpointer(//*[@os='dg9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
 
     </variablelist>

BOOK/cross-tools/common/glibc.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="dd">Add the following to <filename>config.cache</filename>
-    to disable ssp when building Glibc:</para>
-
-<screen os="de"><userinput>echo "libc_cv_ssp=no" &gt; config.cache</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/glibc.xml"
@@ -50 +45 @@
     --disable-profile --enable-kernel=&glibc-kernel-version; \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="dg">
@@ -129 +124 @@
       </varlistentry>
 
-      <varlistentry os="dg10">
-        <term><parameter>--cache-file=config.cache</parameter></term>
-        <listitem>
-          <para>This tells Glibc to utilize a premade cache file.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 

BOOK/cross-tools/mips64/glibc-n32.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
     <para os="n1">Configure Glibc to install its 32-bit libraries into <filename
     class="directory">/tools/lib32</filename>:</para>
 
-<screen os="n2"><userinput>echo "libc_cv_rtlddir=/tools/lib32" &gt;&gt; config.cache
-echo "libc_cv_slibdir=/tools/lib32" &gt;&gt; config.cache</userinput></screen>
+<screen os="n2"><userinput>echo "libc_cv_slibdir=/tools/lib32" &gt;&gt; config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/multilib/glibc-64bit.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
     <para os="n1">Configure Glibc to install its 64-bit libraries into <filename
     class="directory">/tools/lib64</filename>:</para>
 
-<screen os="n2"><userinput>echo "libc_cv_rtlddir=/tools/lib64" &gt;&gt; config.cache
-echo "libc_cv_slibdir=/tools/lib64" &gt;&gt; config.cache</userinput></screen>
+<screen os="n2"><userinput>echo "libc_cv_slibdir=/tools/lib64" &gt;&gt; config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/multilib/glibc.xml

@@ -37 +37 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -53 +45 @@
     --disable-profile --enable-kernel=&glibc-kernel-version; \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="dg">
@@ -98 +90 @@
       xpointer="xpointer(//*[@os='dg9'])"/>
 
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
-
     </variablelist>
 

BOOK/cross-tools/sparc64-64/glibc.xml

@@ -34 +34 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/sparc64/glibc-64bit.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
+    <para os="dd">Add the following variables to <filename>config.cache</filename> so they are set properly:</para>
 
 <screen os="de"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
@@ -44 +42 @@
 libc_cv_sparc64_tls=yes
 libc_cv_gnu89_inline=yes
-libc_cv_ssp=no
 EOF</userinput></screen>