Changeset 71cd9de

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

Files:

• cross-tools/64/glibc.xml (modified) (3 diffs)
• cross-tools/common/glibc.xml (modified) (3 diffs)
• cross-tools/mips64/glibc-n32.xml (modified) (1 diff)
• cross-tools/multilib/glibc-64bit.xml (modified) (1 diff)
• cross-tools/multilib/glibc.xml (modified) (3 diffs)
• cross-tools/sparc64-64/glibc.xml (modified) (1 diff)
• cross-tools/sparc64/glibc-64bit.xml (modified) (2 diffs)
• final-system/mips64-64/glibc.xml (modified) (1 diff)
• final-system/multilib/glibc-64bit.xml (modified) (1 diff)
• final-system/ppc64-64/glibc.xml (modified) (2 diffs)
• final-system/sparc64-64/glibc.xml (modified) (1 diff)
• final-system/x86_64-64/glibc.xml (modified) (2 diffs)
• packages.ent (modified) (1 diff)

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>
 

BOOK/final-system/mips64-64/glibc.xml

@@ -53 +53 @@
     href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l7'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l8'])"/>
 
     <para>Now we will force Glibc to build as 64-bit instead of the default

BOOK/final-system/multilib/glibc-64bit.xml

@@ -46 +46 @@
     <filename class="directory">/lib64</filename>:</para>
 
-<screen os="m2"><userinput>echo "libc_cv_rtlddir=/lib64" &gt;&gt; config.cache
-echo "libc_cv_slibdir=/lib64" &gt;&gt; config.cache</userinput></screen>
+<screen os="m2"><userinput>echo "libc_cv_slibdir=/lib64" &gt;&gt; config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/ppc64-64/glibc.xml

@@ -53 +53 @@
     href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l7'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -119 +127 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <para>Now we can remove this symlink. We also need to correct the <command>
-    /usr/bin/ldd</command> script - if you look at this, you will see it references
-    not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
-    is. The following <command>sed</command> will correct this:</para>
+    <para>Now we can remove this symlink:</para>
 
-    <screen><userinput>rm -v /lib/ld.so.1
-sed -i.bak '/RTLDLIST/s%/ld.so.1 /lib64%%' /usr/bin/ldd</userinput></screen>
-
-    <para>Check the script to make sure the sed worked correctly, then delete
-    the backup.</para>
-
-    <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+    <screen><userinput>rm -v /lib/ld.so.1</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -61 +61 @@
     href="../x86_64-64/glibc.xml"
     xpointer="xpointer(//*[@os='l6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l7'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/x86_64-64/glibc.xml

@@ -49 +49 @@
     <filename class="directory">/lib</filename>:</para>
 
-<screen os="l6"><userinput>echo "libc_cv_rtlddir=/lib" &gt;&gt; config.cache
-echo "libc_cv_slibdir=/lib" &gt;&gt; config.cache</userinput></screen>
+<screen os="l6"><userinput>echo "libc_cv_slibdir=/lib" &gt;&gt; config.cache</userinput></screen>
+
+    <para os="l7">Modify the <command>ldd</command> rewrite script to remove
+    <filename class="directory">lib64</filename> and
+    <filename class="directory">libx32</filename> from RTLDLIST.</para>
+
+<screen os="l8"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -127 +132 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <para>Now we can remove this symlink.  We also need to correct the <command>
-    /usr/bin/ldd</command> script - if you look at this, you will see it references
-    not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
-    is. The following <command>sed</command> will correct this:</para>
+    <para>Now we can remove this symlink:</para>
 
-    <screen><userinput>rm -v /lib/ld-linux.so.2
-sed -i.bak '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd</userinput></screen>
-
-    <para>Check the script to make sure the sed worked correctly, then delete
-    the backup.</para>
-
-    <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+    <screen><userinput>rm -v /lib/ld-linux.so.2</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/packages.ent

@@ -208 +208 @@
 <!ENTITY gettext-home "&gnu-software;gettext">
 
-<!ENTITY glibc-version "2.20">
-<!ENTITY glibc-size "12,284 KB">
+<!ENTITY glibc-version "2.22">
+<!ENTITY glibc-size "12,969 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "948a6e06419a01bd51e97206861595b0">
+<!ENTITY glibc-md5 "e51e02bf552a0a1fbbdc948fb2f5e83c">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ld-name "ld-&glibc-version;.so">