瀏覽代碼

Upgrade to Glibc-2.17. Fixes #3261.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10075 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 12 年之前
父節點
當前提交
c906b7e5cc
共有 7 個文件被更改,包括 21 次插入115 次删除
  1. 4 0
      chapter01/changelog.xml
  2. 10 6
      chapter01/whatsnew.xml
  3. 0 16
      chapter03/patches.xml
  4. 0 4
      chapter05/glibc.xml
  5. 1 75
      chapter06/glibc.xml
  6. 6 6
      packages.ent
  7. 0 8
      patches.ent

+ 4 - 0
chapter01/changelog.xml

@@ -39,6 +39,10 @@
     <listitem>
     <listitem>
       <para>2012-12-28</para>
       <para>2012-12-28</para>
       <itemizedlist>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Glibc-2.17.  Fixes
+          <ulink url="&lfs-ticket-root;3261">#3261</ulink>.</para>
+        </listitem>
         <listitem>
         <listitem>
           <para>[matthew] - Upgrade to Sed-4.2.2.  Fixes
           <para>[matthew] - Upgrade to Sed-4.2.2.  Fixes
           <ulink url="&lfs-ticket-root;3260">#3260</ulink>.</para>
           <ulink url="&lfs-ticket-root;3260">#3260</ulink>.</para>

+ 10 - 6
chapter01/whatsnew.xml

@@ -85,9 +85,9 @@
     <!--<listitem>
     <!--<listitem>
       <para>Gettext &gettext-version;</para>
       <para>Gettext &gettext-version;</para>
     </listitem>-->
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Glibc &glibc-version;</para>
       <para>Glibc &glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
     <listitem>
       <para>GMP &gmp-version;</para>
       <para>GMP &gmp-version;</para>
     </listitem>
     </listitem>
@@ -236,10 +236,6 @@
       <para>&gcc-startfiles-patch;</para>
       <para>&gcc-startfiles-patch;</para>
     </listitem>
     </listitem>
 
 
-    <listitem>
-      <para>&glibc-installation-patch;</para>
-    </listitem>
-
     <listitem>
     <listitem>
       <para>&make-fixes-patch;</para>
       <para>&make-fixes-patch;</para>
     </listitem>
     </listitem>
@@ -261,6 +257,14 @@
       <para>gcc-4.7.1-startfiles_fix-1.patch</para>
       <para>gcc-4.7.1-startfiles_fix-1.patch</para>
     </listitem>
     </listitem>
 
 
+    <listitem>
+      <para>glibc-2.16.0-fix_test_installation-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>glibc-2.16.0-res_query_fix-1.patch</para>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>kmod-9-testsuite-1.patch</para>
       <para>kmod-9-testsuite-1.patch</para>
     </listitem>
     </listitem>

+ 0 - 16
chapter03/patches.xml

@@ -50,22 +50,6 @@
       </listitem>
       </listitem>
     </varlistentry>
     </varlistentry>
 
 
-    <varlistentry>
-      <term>Glibc DNS Resolve Patch - <token>&glibc-fix-resolv-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-fix-resolv-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-fix-resolv-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc test-installation.pl Patch - <token>&glibc-installation-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-installation-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-installation-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
     <varlistentry>
       <term>Kbd Loadkeys Fix Patch - <token>&kbd-fixes-patch-size;</token>:</term>
       <term>Kbd Loadkeys Fix Patch - <token>&kbd-fixes-patch-size;</token>:</term>
       <listitem>
       <listitem>

+ 0 - 4
chapter05/glibc.xml

@@ -52,10 +52,6 @@
   su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc'
   su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc'
 fi</userinput></screen>
 fi</userinput></screen>
 
 
-    <para>Fix an issue when building Glibc-&glibc-version; with GCC-&gcc-version;:</para>
-
-<screen><userinput remap="pre">sed -i 's/ -lgcc_s//' Makeconfig</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc outside of the source
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
     directory in a dedicated build directory:</para>
 
 

+ 1 - 75
chapter06/glibc.xml

@@ -61,67 +61,12 @@
     Glibc autoconf tests would give false results and defeat the goal
     Glibc autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
     of achieving a clean build.</para>
 
 
-<!--
-    This should have been fixed a long time ago.
-
-    <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite
-    loop at startup. It is unknown whether this is a <command>bash</command>
-    bug or a Glibc problem. Disable installation of this locale in order to
-    avoid the problem:</para>
-
-<screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
--->
-
-    <para>Fix a problem that causes the build to fail in the LFS environment:</para>
-
-<screen><userinput remap="pre">sed -i 's#&lt;rpc/types.h&gt;#"rpc/types.h"#' sunrpc/rpc_clntout.c</userinput></screen>
-
-<!--    <para>When running <command>make install</command>, a script called
-    <filename>test-installation.pl</filename> performs a small sanity test on
-    our newly installed Glibc. However, because our toolchain still points to
-    the <filename class="directory">/tools</filename> directory, the sanity
-    test would be carried out against the wrong Glibc. We can force the script
-    to check the Glibc we have just installed with the following:</para>
-
-<screen><userinput remap="pre">DL=$(readelf -l /bin/sh | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
-sed -i &quot;s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|&quot; \
-        scripts/test-installation.pl
-unset DL</userinput></screen>-->
-
-    <para>When running <command>make install</command>, a script called
-    <filename>test-installation.pl</filename> performs a small sanity test on
-    our newly installed Glibc. Use a patch to fix the bug that causes it to
-    fail:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-installation-patch;</userinput></screen>
-
-    <para>The <command>ldd</command> shell script contains Bash-specific
-    syntax. Change its default program interpreter to <command>/bin/bash</command>
-    in case another <command>/bin/sh</command> is installed as described in the
-    <ulink url="&blfs-root;view/svn/postlfs/shells.html">Shells</ulink>
-    chapter of the BLFS book:</para>
-
-<screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
-
-    <para>Now fix a problem that causes some applications to crash when 
-    utilizing problem nameservers:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fix-resolv-patch;</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc outside of the source
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
     directory in a dedicated build directory:</para>
 
 
 <screen><userinput remap="pre">mkdir -v ../glibc-build
 <screen><userinput remap="pre">mkdir -v ../glibc-build
 cd ../glibc-build</userinput></screen>
 cd ../glibc-build</userinput></screen>
-<!--
-    <para>As in Chapter 5, add the needed compiler flags to CFLAGS for x86 machines.
-    Here, the optimization of the library is also set for the gcc compiler to
-    enhance compilation speed (-pipe) and package performance (-O3).</para>
-
-<screen><userinput remap="configure">case `uname -m` in
-  i?86) echo "CFLAGS += -march=i486 -mtune=native -O3 -pipe" &gt; configparms ;;
-esac</userinput></screen>
--->
+
     <para>Prepare Glibc for compilation:</para>
     <para>Prepare Glibc for compilation:</para>
 
 
 <screen><userinput remap="configure">../glibc-&glibc-version;/configure  \
 <screen><userinput remap="configure">../glibc-&glibc-version;/configure  \
@@ -157,8 +102,6 @@ esac</userinput></screen>
     <para>Generally a few tests do not pass, but you can generally ignore
     <para>Generally a few tests do not pass, but you can generally ignore
     any of the test failures listed below. Now test the build results:</para>
     any of the test failures listed below. Now test the build results:</para>
 
 
-<!-- cp -v ../glibc-&glibc-version;/iconvdata/gconv-modules iconvdata -->
-
 <screen><userinput remap="test">make -k check 2&gt;&amp;1 | tee glibc-check-log
 <screen><userinput remap="test">make -k check 2&gt;&amp;1 | tee glibc-check-log
 grep Error glibc-check-log</userinput></screen>
 grep Error glibc-check-log</userinput></screen>
 
 
@@ -169,12 +112,6 @@ grep Error glibc-check-log</userinput></screen>
     most common issues:</para>
     most common issues:</para>
 
 
     <itemizedlist>
     <itemizedlist>
-      <!-- Check again after updating from gcc-4.1.x -->
-      <!-- Haven;t seen this in quite a while <listitem>
-        <para>The <emphasis>nptl/tst-cancel1</emphasis> test will fail when
-        using the 4.1 series of GCC.</para>
-      </listitem> -->
-      <!-- Was true in glibc-2.3.6, rt/tst-cpuclock2 in glibc-2.11.1 -->
 
 
       <listitem>
       <listitem>
         <para>The <emphasis>nptl/tst-clock2</emphasis>,
         <para>The <emphasis>nptl/tst-clock2</emphasis>,
@@ -192,15 +129,6 @@ grep Error glibc-check-log</userinput></screen>
         authentic AMD processor.</para>
         authentic AMD processor.</para>
       </listitem>
       </listitem>
       
       
-      <!--
-      <listitem>
-        <para>If you have mounted the LFS partition with the
-        <parameter>noatime</parameter> option, the <emphasis>atime</emphasis>
-        test will fail. As mentioned in <xref linkend="space-mounting"/>, do not
-        use the <parameter>noatime</parameter> option while building LFS.</para>
-      </listitem>
-      -->
-      
       <listitem>
       <listitem>
         <para>When running on older and slower hardware or on systems under
         <para>When running on older and slower hardware or on systems under
         load, some tests can fail because of test timeouts being exceeded.
         load, some tests can fail because of test timeouts being exceeded.
@@ -287,8 +215,6 @@ localedef -i zh_CN -f GB18030 zh_CN.GB18030</userinput></screen>
     install locales not listed in the
     install locales not listed in the
     <filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file
     <filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file
     in the unlikely case you need them.</para>
     in the unlikely case you need them.</para>
-    <!-- The Live CD patches the localedata/SUPPORTED file instead of
-    running localedef, the results are equivalent -->
 
 
   </sect2>
   </sect2>
 
 

+ 6 - 6
packages.ent

@@ -198,10 +198,10 @@
 <!ENTITY gettext-ch6-du "180 MB">
 <!ENTITY gettext-ch6-du "180 MB">
 <!ENTITY gettext-ch6-sbu "2.3 SBU">
 <!ENTITY gettext-ch6-sbu "2.3 SBU">
 
 
-<!ENTITY glibc-version "2.16.0">
-<!ENTITY glibc-size "9,756 KB">
+<!ENTITY glibc-version "2.17">
+<!ENTITY glibc-size "10,725 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "80b181b02ab249524ec92822c0174cf7">
+<!ENTITY glibc-md5 "87bf675c8ee523ebda4803e8e1cec638">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "554 MB">
 <!ENTITY glibc-ch5-du "554 MB">
 <!ENTITY glibc-ch5-sbu "5.4 SBU">
 <!ENTITY glibc-ch5-sbu "5.4 SBU">
@@ -540,10 +540,10 @@
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
 
-<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-3"> 
-<!ENTITY udev-lfs-size   "20 KB">   
+<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-4">
+<!ENTITY udev-lfs-size   "18 KB">
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
-<!ENTITY udev-lfs-md5    "0dbcb1731ee2b74b34ab4f1a65e66c30">    
+<!ENTITY udev-lfs-md5    "2d86cc6b8a9f5961429d57d98c88fca4">
 <!ENTITY udev-lfs-home   " ">
 <!ENTITY udev-lfs-home   " ">
 
 
 <!ENTITY util-linux-version "2.22.2">
 <!ENTITY util-linux-version "2.22.2">

+ 0 - 8
patches.ent

@@ -29,14 +29,6 @@
 <!ENTITY gcc-startfiles-patch-md5 "799ef1971350d2e3c794f2123f247cc6">
 <!ENTITY gcc-startfiles-patch-md5 "799ef1971350d2e3c794f2123f247cc6">
 <!ENTITY gcc-startfiles-patch-size "1.5 KB">
 <!ENTITY gcc-startfiles-patch-size "1.5 KB">
 
 
-<!ENTITY glibc-fix-resolv-patch "glibc-&glibc-version;-res_query_fix-1.patch">
-<!ENTITY glibc-fix-resolv-patch-md5 "d37659c643b1a2150624120238e5b295">
-<!ENTITY glibc-fix-resolv-patch-size "2.0 KB">
-
-<!ENTITY glibc-installation-patch "glibc-&glibc-version;-fix_test_installation-1.patch">
-<!ENTITY glibc-installation-patch-md5 "0a3bd5919ea226efebed62833a0985c6">
-<!ENTITY glibc-installation-patch-size "1.4 KB">
-
 
 
 <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
 <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
 <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">
 <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">