diff options
-rw-r--r-- | chapter01/changelog.xml | 7 | ||||
-rw-r--r-- | chapter01/whatsnew.xml | 8 | ||||
-rw-r--r-- | chapter03/packages.xml | 4 | ||||
-rw-r--r-- | chapter03/patches.xml | 18 | ||||
-rw-r--r-- | chapter05/glibc.xml | 6 | ||||
-rw-r--r-- | chapter06/glibc.xml | 28 | ||||
-rw-r--r-- | packages.ent | 16 | ||||
-rw-r--r-- | patches.ent | 9 |
8 files changed, 75 insertions, 21 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index b67325641..85760f09b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -38,9 +38,14 @@ --> <listitem> - <para>Date</para> + <para>2008-10-05</para> <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> <para>[randy] - Added the GMP and MPFR packages to the list of packages in Chapter 3. Thanks to Lefteris Dimitroulakis for pointing out the omission.</para> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 7f284ef46..a01231ba4 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -227,6 +227,14 @@ </listitem> <listitem> + <para>&glibc-iconv-test-fixes-patch;</para> + </listitem> + + <listitem> + <para>&glibc-ildoubl-test-fix-patch;</para> + </listitem> + + <listitem> <para>&grep-debian-patch;</para> </listitem> diff --git a/chapter03/packages.xml b/chapter03/packages.xml index ec25e6e45..3d4412728 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -203,14 +203,14 @@ </listitem> </varlistentry> - <varlistentry> + <!-- <varlistentry> <term>Glibc LibIDN add-on (&glibc-libidn-version;) - <token>&glibc-libidn-size;</token>:</term> <listitem> <para>Home page: <ulink url="&glibc-libidn-home;"/></para> <para>Download: <ulink url="&glibc-libidn-url;"/></para> <para>MD5 sum: <literal>&glibc-libidn-md5;</literal></para> </listitem> - </varlistentry> + </varlistentry> --> <varlistentry> <term>GMP (&gmp-version;) - <token>&gmp-size;</token>:</term> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 19e5074a5..c0d02d7e7 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -91,7 +91,23 @@ </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> <para>Download: <ulink url="&patches-root;&grep-debian-patch;"/></para> <para>MD5 sum: <literal>&grep-debian-patch-md5;</literal></para> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 4ef95147f..1919f9850 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -43,6 +43,12 @@ <sect2 role="installation"> <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; && +patch -Np1 -i &glibc-ildoubl-test-fix-patch;</userinput></screen> + <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 65a4383d7..192b21240 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -61,23 +61,23 @@ Glibc autoconf tests would give false results and defeat the goal 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 <filename class="libraryfile">libidn</filename> library, not this add-on (see <ulink url="&blfs-root;view/svn/general/libidn.html"/>). Unpack the tarball from within the Glibc source directory:</para> <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 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> +<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 our newly installed Glibc. However, because our toolchain still points to 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 \ '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; && +patch -Np1 -i &glibc-ildoubl-test-fix-patch;</userinput></screen> + <para>The <command>ldd</command> shell script contains Bash-specific 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> </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>&1 | tee glibc-check-log +<screen><userinput remap="test">cp -v ../glibc-&glibc-version;/iconvdata/gconv-modules iconvdata && +make -k check 2>&1 | tee glibc-check-log grep Error glibc-check-log</userinput></screen> <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 install locales not listed in the <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 running localedef, the results are equivalent --> diff --git a/packages.ent b/packages.ent index 5a0ca85f8..a1d83da34 100644 --- a/packages.ent +++ b/packages.ent @@ -192,15 +192,15 @@ <!ENTITY gettext-ch6-du "65 MB"> <!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-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-size "100 KB"> <!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2"> diff --git a/patches.ent b/patches.ent index 2fbec72e0..52dff2b5c 100644 --- a/patches.ent +++ b/patches.ent @@ -43,6 +43,15 @@ <!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-md5 "337d017202d7e3b08d428a89da3ee572"> <!ENTITY grep-debian-patch-size "27 KB"> |