Changeset 71cd9de


Ignore:
Timestamp:
Oct 17, 2015, 3:01:41 PM (4 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:
13 edited

Legend:

Unmodified
Added
Removed
  • BOOK/cross-tools/64/glibc.xml

    re869c0f r71cd9de  
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3838    href="../common/glibc.xml"
    39     xpointer="xpointer(//*[@os='dd'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/glibc.xml"
    43     xpointer="xpointer(//*[@os='de'])"/>
    44 
    45     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/glibc.xml"
    4739    xpointer="xpointer(//*[@os='g'])"/>
    4840
     
    5345      --disable-profile --enable-kernel=&glibc-kernel-version; \
    5446      --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    55       --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
     47      --enable-obsolete-rpc</userinput></screen>
    5648
    5749    <variablelist os="dg">
     
    9385      href="../common/glibc.xml"
    9486      xpointer="xpointer(//*[@os='dg9'])"/>
    95 
    96       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    97       href="../common/glibc.xml"
    98       xpointer="xpointer(//*[@os='dg10'])"/>
    9987
    10088    </variablelist>
  • BOOK/cross-tools/common/glibc.xml

    re869c0f r71cd9de  
    3535    xpointer="xpointer(//*[@os='f'])"/>
    3636
    37     <para os="dd">Add the following to <filename>config.cache</filename>
    38     to disable ssp when building Glibc:</para>
    39 
    40 <screen os="de"><userinput>echo "libc_cv_ssp=no" &gt; config.cache</userinput></screen>
    41 
    4237    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4338    href="../../final-system/common/glibc.xml"
     
    5045    --disable-profile --enable-kernel=&glibc-kernel-version; \
    5146    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    52     --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
     47    --enable-obsolete-rpc</userinput></screen>
    5348
    5449    <variablelist os="dg">
     
    129124      </varlistentry>
    130125
    131       <varlistentry os="dg10">
    132         <term><parameter>--cache-file=config.cache</parameter></term>
    133         <listitem>
    134           <para>This tells Glibc to utilize a premade cache file.</para>
    135         </listitem>
    136       </varlistentry>
    137 
    138126    </variablelist>
    139127
  • BOOK/cross-tools/mips64/glibc-n32.xml

    re869c0f r71cd9de  
    3535    xpointer="xpointer(//*[@os='f'])"/>
    3636
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../multilib/glibc.xml"
    39     xpointer="xpointer(//*[@os='dd'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../multilib/glibc.xml"
    43     xpointer="xpointer(//*[@os='de'])"/>
    44 
    4537    <para os="n1">Configure Glibc to install its 32-bit libraries into <filename
    4638    class="directory">/tools/lib32</filename>:</para>
    4739
    48 <screen os="n2"><userinput>echo "libc_cv_rtlddir=/tools/lib32" &gt;&gt; config.cache
    49 echo "libc_cv_slibdir=/tools/lib32" &gt;&gt; config.cache</userinput></screen>
     40<screen os="n2"><userinput>echo "libc_cv_slibdir=/tools/lib32" &gt;&gt; config.cache</userinput></screen>
    5041
    5142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/cross-tools/multilib/glibc-64bit.xml

    re869c0f r71cd9de  
    3535    xpointer="xpointer(//*[@os='f'])"/>
    3636
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="glibc.xml"
    39     xpointer="xpointer(//*[@os='dd'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="glibc.xml"
    43     xpointer="xpointer(//*[@os='de'])"/>
    44 
    4537    <para os="n1">Configure Glibc to install its 64-bit libraries into <filename
    4638    class="directory">/tools/lib64</filename>:</para>
    4739
    48 <screen os="n2"><userinput>echo "libc_cv_rtlddir=/tools/lib64" &gt;&gt; config.cache
    49 echo "libc_cv_slibdir=/tools/lib64" &gt;&gt; config.cache</userinput></screen>
     40<screen os="n2"><userinput>echo "libc_cv_slibdir=/tools/lib64" &gt;&gt; config.cache</userinput></screen>
    5041
    5142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/cross-tools/multilib/glibc.xml

    re869c0f r71cd9de  
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3838    href="../common/glibc.xml"
    39     xpointer="xpointer(//*[@os='dd'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/glibc.xml"
    43     xpointer="xpointer(//*[@os='de'])"/>
    44 
    45     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/glibc.xml"
    4739    xpointer="xpointer(//*[@os='g'])"/>
    4840
     
    5345    --disable-profile --enable-kernel=&glibc-kernel-version; \
    5446    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    55     --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
     47    --enable-obsolete-rpc</userinput></screen>
    5648
    5749    <variablelist os="dg">
     
    9890      xpointer="xpointer(//*[@os='dg9'])"/>
    9991
    100       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    101       href="../common/glibc.xml"
    102       xpointer="xpointer(//*[@os='dg10'])"/>
    103 
    10492    </variablelist>
    10593
  • BOOK/cross-tools/sparc64-64/glibc.xml

    re869c0f r71cd9de  
    3434    href="../common/glibc.xml"
    3535    xpointer="xpointer(//*[@os='f'])"/>
    36 
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/glibc.xml"
    39     xpointer="xpointer(//*[@os='dd'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../sparc64/glibc-64bit.xml"
    43     xpointer="xpointer(//*[@os='de'])"/>
    4436
    4537    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/cross-tools/sparc64/glibc-64bit.xml

    re869c0f r71cd9de  
    3535    xpointer="xpointer(//*[@os='f'])"/>
    3636
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/glibc.xml"
    39     xpointer="xpointer(//*[@os='dd'])"/>
     37    <para os="dd">Add the following variables to <filename>config.cache</filename> so they are set properly:</para>
    4038
    4139<screen os="de"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
     
    4442libc_cv_sparc64_tls=yes
    4543libc_cv_gnu89_inline=yes
    46 libc_cv_ssp=no
    4744EOF</userinput></screen>
    4845
  • BOOK/final-system/mips64-64/glibc.xml

    re869c0f r71cd9de  
    5353    href="../x86_64-64/glibc.xml"
    5454    xpointer="xpointer(//*[@os='l6'])"/>
     55
     56    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     57    href="../x86_64-64/glibc.xml"
     58    xpointer="xpointer(//*[@os='l7'])"/>
     59
     60    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     61    href="../x86_64-64/glibc.xml"
     62    xpointer="xpointer(//*[@os='l8'])"/>
    5563
    5664    <para>Now we will force Glibc to build as 64-bit instead of the default
  • BOOK/final-system/multilib/glibc-64bit.xml

    re869c0f r71cd9de  
    4646    <filename class="directory">/lib64</filename>:</para>
    4747
    48 <screen os="m2"><userinput>echo "libc_cv_rtlddir=/lib64" &gt;&gt; config.cache
    49 echo "libc_cv_slibdir=/lib64" &gt;&gt; config.cache</userinput></screen>
     48<screen os="m2"><userinput>echo "libc_cv_slibdir=/lib64" &gt;&gt; config.cache</userinput></screen>
    5049
    5150    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/ppc64-64/glibc.xml

    re869c0f r71cd9de  
    5353    href="../x86_64-64/glibc.xml"
    5454    xpointer="xpointer(//*[@os='l6'])"/>
     55
     56    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     57    href="../x86_64-64/glibc.xml"
     58    xpointer="xpointer(//*[@os='l7'])"/>
     59
     60    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     61    href="../x86_64-64/glibc.xml"
     62    xpointer="xpointer(//*[@os='l8'])"/>
    5563
    5664    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    119127    xpointer="xpointer(//*[@os='t'])"/>
    120128
    121     <para>Now we can remove this symlink. We also need to correct the <command>
    122     /usr/bin/ldd</command> script - if you look at this, you will see it references
    123     not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
    124     is. The following <command>sed</command> will correct this:</para>
     129    <para>Now we can remove this symlink:</para>
    125130
    126     <screen><userinput>rm -v /lib/ld.so.1
    127 sed -i.bak '/RTLDLIST/s%/ld.so.1 /lib64%%' /usr/bin/ldd</userinput></screen>
    128 
    129     <para>Check the script to make sure the sed worked correctly, then delete
    130     the backup.</para>
    131 
    132     <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
     131    <screen><userinput>rm -v /lib/ld.so.1</userinput></screen>
    133132
    134133    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/sparc64-64/glibc.xml

    re869c0f r71cd9de  
    6161    href="../x86_64-64/glibc.xml"
    6262    xpointer="xpointer(//*[@os='l6'])"/>
     63
     64    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     65    href="../x86_64-64/glibc.xml"
     66    xpointer="xpointer(//*[@os='l7'])"/>
     67
     68    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     69    href="../x86_64-64/glibc.xml"
     70    xpointer="xpointer(//*[@os='l8'])"/>
    6371
    6472    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/x86_64-64/glibc.xml

    re869c0f r71cd9de  
    4949    <filename class="directory">/lib</filename>:</para>
    5050
    51 <screen os="l6"><userinput>echo "libc_cv_rtlddir=/lib" &gt;&gt; config.cache
    52 echo "libc_cv_slibdir=/lib" &gt;&gt; config.cache</userinput></screen>
     51<screen os="l6"><userinput>echo "libc_cv_slibdir=/lib" &gt;&gt; config.cache</userinput></screen>
     52
     53    <para os="l7">Modify the <command>ldd</command> rewrite script to remove
     54    <filename class="directory">lib64</filename> and
     55    <filename class="directory">libx32</filename> from RTLDLIST.</para>
     56
     57<screen os="l8"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
    5358
    5459    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    127132    xpointer="xpointer(//*[@os='t'])"/>
    128133
    129     <para>Now we can remove this symlink.  We also need to correct the <command>
    130     /usr/bin/ldd</command> script - if you look at this, you will see it references
    131     not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
    132     is. The following <command>sed</command> will correct this:</para>
     134    <para>Now we can remove this symlink:</para>
    133135
    134     <screen><userinput>rm -v /lib/ld-linux.so.2
    135 sed -i.bak '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd</userinput></screen>
    136 
    137     <para>Check the script to make sure the sed worked correctly, then delete
    138     the backup.</para>
    139 
    140     <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
     136    <screen><userinput>rm -v /lib/ld-linux.so.2</userinput></screen>
    141137
    142138    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/packages.ent

    re869c0f r71cd9de  
    208208<!ENTITY gettext-home "&gnu-software;gettext">
    209209
    210 <!ENTITY glibc-version "2.20">
    211 <!ENTITY glibc-size "12,284 KB">
     210<!ENTITY glibc-version "2.22">
     211<!ENTITY glibc-size "12,969 KB">
    212212<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
    213 <!ENTITY glibc-md5 "948a6e06419a01bd51e97206861595b0">
     213<!ENTITY glibc-md5 "e51e02bf552a0a1fbbdc948fb2f5e83c">
    214214<!ENTITY glibc-home "&gnu-software;libc/">
    215215<!ENTITY glibc-ld-name "ld-&glibc-version;.so">
Note: See TracChangeset for help on using the changeset viewer.