diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ecf606196..b27ba26ea 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,16 @@ --> + + 2012-08-05 + + + [matthew] - Upgrade to Glibc-2.16.0. Fixes + #3131. + + + + 2012-07-25 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index d6555274f..f2f772f32 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -231,14 +231,6 @@ &coreutils-i18n-patch; - - &glibc-fixes-patch; - - - - &glibc-gcc_fix-patch; - - &kbd-fixes-patch; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index daa9f2581..c14b3e86a 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -58,22 +58,6 @@ - - Glibc Fixes Patch - &glibc-fixes-patch-size;: - - Download: - MD5 sum: &glibc-fixes-patch-md5; - - - - - Glibc GCC Fix Patch - &glibc-gcc_fix-patch-size;: - - Download: - MD5 sum: &glibc-gcc_fix-patch-md5; - - - - When running make install, a script called + Fix a bug that causes the build to fail: + +sed -i 's#<rpc/types.h>#"rpc/types.h"#' sunrpc/rpc_clntout.c + + - In addition, there is a bug in the - test-installation.pl script in that it tries to link - a test program to a library that isn't installed by - make install. Issue the following sed - command to fix it: + When running make install, a script called + test-installation.pl performs a small sanity test on + our newly installed Glibc. However, it contains a bug that causes it to + fail, so prevent it from running by issuing the following command: - sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl +sed -i '/test-installation.pl/d' Makefile The ldd shell script contains Bash-specific syntax. Change its default program interpreter to /bin/bash @@ -100,12 +103,6 @@ unset DL sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in - Fix a bug that causes several BLFS packages to segfault: -patch -Np1 -i ../&glibc-fixes-patch; - - Fix a bug that prevents Glibc from building with GCC-&gcc-version;: -patch -Np1 -i ../&glibc-gcc_fix-patch; - The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: @@ -315,6 +312,16 @@ rpc: files # End /etc/nsswitch.conf EOF + Install timezone data: +tar -xf ../tzdata&tzdata-version;.tar.gz + +for tz in etcetera southamerica northamerica europe africa antarctica \ + asia australasia backward pacificnew solar87 solar88 solar89 systemv; do + + zic -L leapseconds -d /usr/share/zoneinfo -y "sh yearistype.sh" ${tz} + +done + One way to determine the local time zone, run the following script: diff --git a/chapter06/grub.xml b/chapter06/grub.xml index 249447d1a..ea8f649da 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -40,6 +40,10 @@ Installation of GRUB + Fix an incompatibility between this package and Glibc-&glibc-version;: + +sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h + Prepare GRUB for compilation: ./configure --prefix=/usr \ diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index 460fe98c7..471eaa0e2 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -40,6 +40,12 @@ Installation of Inetutils + Fix an incompatibility between this package and Glibc-&glibc-version; + +sed -i -e '/gets is a/d' lib/stdio.in.h + + Prepare Inetutils for compilation: + ./configure --prefix=/usr \ --libexecdir=/usr/sbin \ --localstatedir=/var \ diff --git a/chapter06/libpipeline.xml b/chapter06/libpipeline.xml index d9ecf4e55..060914c8d 100644 --- a/chapter06/libpipeline.xml +++ b/chapter06/libpipeline.xml @@ -41,6 +41,10 @@ Installation of Libpipeline + Fix an incompatibility between this package and Glibc-&glibc-version;: + +sed -i -e '/gets is a/d' gnulib/lib/stdio.in.h + Prepare Libpipeline for compilation: PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr diff --git a/chapter06/m4.xml b/chapter06/m4.xml index fcbb8f672..3a20da992 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -40,6 +40,10 @@ Installation of M4 + Fix an incompatibility between this package and Glibc-&glibc-version;: + +sed -i -e '/gets is a/d' lib/stdio.in.h + Prepare M4 for compilation: ./configure --prefix=/usr diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index 659934221..81faa9b2e 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -41,6 +41,10 @@ Installation of Man-DB + Fix an incompatibility between this package and Glibc-&glibc-version; + +sed -i -e '/gets is a/d' gnulib/lib/stdio.in.h + Prepare Man-DB for compilation: ./configure --prefix=/usr \ diff --git a/chapter06/patch.xml b/chapter06/patch.xml index f818a7cc9..2b52d142d 100644 --- a/chapter06/patch.xml +++ b/chapter06/patch.xml @@ -57,7 +57,7 @@ To test the results, issue: -make check +make -k check Install the package: diff --git a/chapter06/perl.xml b/chapter06/perl.xml index b0f0a4464..eff9a3a50 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -107,13 +107,17 @@ + Fix an incompatibility between this package and Glibc-&glibc-version;: + +sed -i '/test-installation.pl/d' Makefile + Compile the package: make To test the results (approximately 2.5 SBU), issue: -make test +make -k test Install the package: diff --git a/chapter06/tar.xml b/chapter06/tar.xml index 842b17156..ddac76af7 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -40,6 +40,10 @@ Installation of Tar + Fix an incompatibility between this package and Glibc-&glibc-version;: + +sed -i -e '/gets is a/d' gnu/stdio.in.h + Prepare Tar for compilation: FORCE_UNSAFE_CONFIGURE=1 \ diff --git a/general.ent b/general.ent index c9a0b2759..b239d3c3e 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index 1b4889f04..55d970cb2 100644 --- a/packages.ent +++ b/packages.ent @@ -198,10 +198,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index 1bbacae47..2f9ca839d 100644 --- a/patches.ent +++ b/patches.ent @@ -37,15 +37,6 @@ - - - - - - - - -