1
0
Эх сурвалжийг харах

Updated Glibc to a 2.8 snapshot taken on 9/29/2008, the tarball of this snapshot includes the libidn data that previously was separately packaged

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8567 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Randy McMurchy 17 жил өмнө
parent
commit
5a25e0a586

+ 6 - 1
chapter01/changelog.xml

@@ -38,8 +38,13 @@
 -->
 -->
 
 
     <listitem>
     <listitem>
-      <para>Date</para>
+      <para>2008-10-05</para>
       <itemizedlist>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated Glibc to a 2.8 snapshot taken on
+          9/29/2008. The tarball of this snapshot includes the libidn
+          data that previously was separately packaged.</para>
+        </listitem>
         <listitem>
         <listitem>
           <para>[randy] - Added the GMP and MPFR packages to the list of
           <para>[randy] - Added the GMP and MPFR packages to the list of
           packages in Chapter 3. Thanks to Lefteris Dimitroulakis for
           packages in Chapter 3. Thanks to Lefteris Dimitroulakis for

+ 8 - 0
chapter01/whatsnew.xml

@@ -226,6 +226,14 @@
       <para>GMP-&gmp-version;</para>
       <para>GMP-&gmp-version;</para>
     </listitem>
     </listitem>
 
 
+    <listitem>
+      <para>&glibc-iconv-test-fixes-patch;</para>
+    </listitem>
+
+    <listitem>
+      <para>&glibc-ildoubl-test-fix-patch;</para>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>&grep-debian-patch;</para>
       <para>&grep-debian-patch;</para>
     </listitem>
     </listitem>

+ 2 - 2
chapter03/packages.xml

@@ -203,14 +203,14 @@
       </listitem>
       </listitem>
     </varlistentry>
     </varlistentry>
 
 
-    <varlistentry>
+    <!-- <varlistentry>
       <term>Glibc LibIDN add-on (&glibc-libidn-version;) - <token>&glibc-libidn-size;</token>:</term>
       <term>Glibc LibIDN add-on (&glibc-libidn-version;) - <token>&glibc-libidn-size;</token>:</term>
       <listitem>
       <listitem>
         <para>Home page: <ulink url="&glibc-libidn-home;"/></para>
         <para>Home page: <ulink url="&glibc-libidn-home;"/></para>
         <para>Download: <ulink url="&glibc-libidn-url;"/></para>
         <para>Download: <ulink url="&glibc-libidn-url;"/></para>
         <para>MD5 sum: <literal>&glibc-libidn-md5;</literal></para>
         <para>MD5 sum: <literal>&glibc-libidn-md5;</literal></para>
       </listitem>
       </listitem>
-    </varlistentry>
+    </varlistentry> -->
 
 
     <varlistentry>
     <varlistentry>
       <term>GMP (&gmp-version;) - <token>&gmp-size;</token>:</term>
       <term>GMP (&gmp-version;) - <token>&gmp-size;</token>:</term>

+ 17 - 1
chapter03/patches.xml

@@ -91,7 +91,23 @@
     </varlistentry>
     </varlistentry>
 
 
     <varlistentry>
     <varlistentry>
-      <term>Grep Debian Patch - <token>&grep-debian-patch-size;</token>;</term>
+      <term>Glibc Iconv Test Fixes Patch - <token>&glibc-iconv-test-fixes-patch-size;</token>:</term>
+      <listitem>
+	<para>Download: <ulink url="&patches-root;&glibc-iconv-test-fixes-patch;"/></para>
+	<para>MD5 sum: <literal>&glibc-iconv-test-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Glibc Ildoubl Test Fix Patch - <token>&glibc-ildoubl-test-fix-patch-size;</token>:</term>
+      <listitem>
+	<para>Download: <ulink url="&patches-root;&glibc-ildoubl-test-fix-patch;"/></para>
+	<para>MD5 sum: <literal>&glibc-ildoubl-test-fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Grep Debian Patch - <token>&grep-debian-patch-size;</token>:</term>
       <listitem>
       <listitem>
 	<para>Download: <ulink url="&patches-root;&grep-debian-patch;"/></para>
 	<para>Download: <ulink url="&patches-root;&grep-debian-patch;"/></para>
 	<para>MD5 sum: <literal>&grep-debian-patch-md5;</literal></para>
 	<para>MD5 sum: <literal>&grep-debian-patch-md5;</literal></para>

+ 6 - 0
chapter05/glibc.xml

@@ -43,6 +43,12 @@
   <sect2 role="installation">
   <sect2 role="installation">
     <title>Installation of Glibc</title>
     <title>Installation of Glibc</title>
 
 
+    <para>Though not mandatory in this chapter, if you plan on running the test
+    suite, you should apply the following patches:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i &glibc-iconv-test-fixes-patch; &amp;&amp;
+patch -Np1 -i &glibc-ildoubl-test-fix-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>
 
 

+ 19 - 9
chapter06/glibc.xml

@@ -61,23 +61,23 @@
     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>
 
 
-    <para>The glibc-libidn tarball adds support for internationalized domain
+    <!-- <para>The glibc-libidn tarball adds support for internationalized domain
     names (IDN) to Glibc. Many programs that support IDN require the full
     names (IDN) to Glibc. Many programs that support IDN require the full
     <filename class="libraryfile">libidn</filename> library, not this add-on (see
     <filename class="libraryfile">libidn</filename> library, not this add-on (see
     <ulink url="&blfs-root;view/svn/general/libidn.html"/>).
     <ulink url="&blfs-root;view/svn/general/libidn.html"/>).
     Unpack the tarball from within the Glibc source directory:</para>
     Unpack the tarball from within the Glibc source directory:</para>
 
 
 <screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
 <screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
-mv glibc-libidn-&glibc-version; libidn</userinput></screen>
+mv glibc-libidn-&glibc-version; libidn</userinput></screen>-->
 
 
-    <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite loop
+    <!-- <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
     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
     Glibc problem. Disable installation of this locale in order to avoid the
     problem:</para>
     problem:</para>
 
 
-<screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
+<screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen> -->
 
 
-    <para>When running <command>make install</command>, a script called
+    <!-- <para>When running <command>make install</command>, a script called
     <filename>test-installation.pl</filename> performs a small sanity test on
     <filename>test-installation.pl</filename> performs a small sanity test on
     our newly installed Glibc. However, because our toolchain still points to
     our newly installed Glibc. However, because our toolchain still points to
     the <filename class="directory">/tools</filename> directory, the sanity
     the <filename class="directory">/tools</filename> directory, the sanity
@@ -86,7 +86,14 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 
 
 <screen><userinput remap="pre">sed -i \
 <screen><userinput remap="pre">sed -i \
 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
-        scripts/test-installation.pl</userinput></screen>
+        scripts/test-installation.pl</userinput></screen> -->
+
+    <para>First apply two patches which correct failures in the test
+    suite:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i &glibc-iconv-test-fixes-patch; &amp;&amp;
+patch -Np1 -i &glibc-ildoubl-test-fix-patch;</userinput></screen>
+
 
 
     <para>The <command>ldd</command> shell script contains Bash-specific
     <para>The <command>ldd</command> shell script contains Bash-specific
     syntax. Change its default program interpreter to <command>/bin/bash</command>
     syntax. Change its default program interpreter to <command>/bin/bash</command>
@@ -136,9 +143,12 @@ cd ../glibc-build</userinput></screen>
       Do not skip it under any circumstance.</para>
       Do not skip it under any circumstance.</para>
     </important>
     </important>
 
 
-    <para>Test the results:</para>
+    <para>Before running the tests, copy a file from the source tree into our
+    build tree to prevent a couple of test failures, then test the
+    results:</para>
 
 
-<screen><userinput remap="test">make -k check 2&gt;&amp;1 | tee glibc-check-log
+<screen><userinput remap="test">cp -v ../glibc-&glibc-version;/iconvdata/gconv-modules iconvdata &amp;&amp;
+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>
 
 
     <para>You will probably see an expected (ignored) failure in the
     <para>You will probably see an expected (ignored) failure in the
@@ -230,7 +240,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
     <para>Then use the <command>localedef</command> command to create and
     <para>Then use the <command>localedef</command> command to create and
     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 if you need them.</para>
+    in the unlikely case you need them.</para>
     <!-- The Live CD patches the localedata/SUPPORTED file instead of
     <!-- The Live CD patches the localedata/SUPPORTED file instead of
     running localedef, the results are equivalent -->
     running localedef, the results are equivalent -->
 
 

+ 8 - 8
packages.ent

@@ -192,15 +192,15 @@
 <!ENTITY gettext-ch6-du "65 MB">
 <!ENTITY gettext-ch6-du "65 MB">
 <!ENTITY gettext-ch6-sbu "1 SBU">
 <!ENTITY gettext-ch6-sbu "1 SBU">
 
 
-<!ENTITY glibc-version "2.7">
-<!ENTITY glibc-size "15,602 KB">
-<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "065c5952b439deba40083ccd67bcc8f7">
+<!ENTITY glibc-version "2.8-20080929">
+<!ENTITY glibc-size "16,231 KB">
+<!ENTITY glibc-url "ftp://sources.redhat.com/pub/glibc/snapshots/glibc-&glibc-version;.tar.bz2">
+<!ENTITY glibc-md5 "ef223822e84f38dc6b3762bcf3bd6c5e">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-home "&gnu-software;libc/">
-<!ENTITY glibc-ch5-du "342 MB">
-<!ENTITY glibc-ch5-sbu "7 SBU">
-<!ENTITY glibc-ch6-du "556 MB testsuite included">
-<!ENTITY glibc-ch6-sbu "19.5 SBU testsuite included">
+<!ENTITY glibc-ch5-du "407 MB">
+<!ENTITY glibc-ch5-sbu "7.6 SBU">
+<!ENTITY glibc-ch6-du "801 MB testsuite included">
+<!ENTITY glibc-ch6-sbu "17.7 SBU testsuite included">
 <!ENTITY glibc-libidn-version "&glibc-version;">
 <!ENTITY glibc-libidn-version "&glibc-version;">
 <!ENTITY glibc-libidn-size "100 KB">
 <!ENTITY glibc-libidn-size "100 KB">
 <!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
 <!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">

+ 9 - 0
patches.ent

@@ -43,6 +43,15 @@
 <!ENTITY expect-spawn-patch-size "6.8 KB">
 <!ENTITY expect-spawn-patch-size "6.8 KB">
 
 
 
 
+<!ENTITY glibc-iconv-test-fixes-patch "glibc-&glibc-version;-iconv_tests-1.patch">
+<!ENTITY glibc-iconv-test-fixes-patch-md5 "cc5e95e418e0b2f8a54b14cf90c7c3b2">
+<!ENTITY glibc-iconv-test-fixes-patch-size "1.7 KB">
+
+<!ENTITY glibc-ildoubl-test-fix-patch "glibc-&glibc-version;-ildoubl_test-1.patch">
+<!ENTITY glibc-ildoubl-test-fix-patch-md5 "4dc864a487eee8426413542591d19edb">
+<!ENTITY glibc-ildoubl-test-fix-patch-size "1.0 KB">
+
+
 <!ENTITY grep-debian-patch "grep-&grep-version;-debian_fixes-1.patch">
 <!ENTITY grep-debian-patch "grep-&grep-version;-debian_fixes-1.patch">
 <!ENTITY grep-debian-patch-md5 "337d017202d7e3b08d428a89da3ee572">
 <!ENTITY grep-debian-patch-md5 "337d017202d7e3b08d428a89da3ee572">
 <!ENTITY grep-debian-patch-size "27 KB">
 <!ENTITY grep-debian-patch-size "27 KB">