diff options
author | Matthew Burgess <matthew@linuxfromscratch.org> | 2012-08-05 14:25:02 +0000 |
---|---|---|
committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2012-08-05 14:25:02 +0000 |
commit | f1c177f9587a73e995b274d60babc763a4ed2f61 (patch) | |
tree | 0b8e3139ea25ac4106cbb4d044c61a46e962fc1f /chapter06 | |
parent | 36ba266b6f3981db638891ec5fa369bc5ae258a2 (diff) |
Upgrade to Glibc-2.16.0. Fixes #3131.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9922 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r-- | chapter06/coreutils.xml | 2 | ||||
-rw-r--r-- | chapter06/diffutils.xml | 4 | ||||
-rw-r--r-- | chapter06/e2fsprogs.xml | 2 | ||||
-rw-r--r-- | chapter06/gettext.xml | 4 | ||||
-rw-r--r-- | chapter06/glibc.xml | 35 | ||||
-rw-r--r-- | chapter06/grub.xml | 4 | ||||
-rw-r--r-- | chapter06/inetutils.xml | 6 | ||||
-rw-r--r-- | chapter06/libpipeline.xml | 4 | ||||
-rw-r--r-- | chapter06/m4.xml | 4 | ||||
-rw-r--r-- | chapter06/man-db.xml | 4 | ||||
-rw-r--r-- | chapter06/patch.xml | 2 | ||||
-rw-r--r-- | chapter06/perl.xml | 6 | ||||
-rw-r--r-- | chapter06/tar.xml | 4 |
13 files changed, 63 insertions, 18 deletions
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index d197e10e6..9a19aa5bd 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -105,7 +105,7 @@ <para>Now run the tests:</para> -<screen><userinput remap="test">su nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen> +<screen><userinput remap="test">su nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen> <para>Remove the temporary group:</para> diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index 0d8bd5c77..6c6400045 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -41,6 +41,10 @@ <sect2 role="installation"> <title>Installation of Diffutils</title> + <para>Fix an incompatibility between this package and Glibc-&glibc-version;</para> + +<screen><userinput remap="pre">sed -i -e '/gets is a/d' lib/stdio.in.h</userinput></screen> + <para>Prepare Diffutils for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 1ebbe6a55..472740379 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -113,7 +113,7 @@ cd build</userinput></screen> <para>To test the results, issue:</para> -<screen><userinput remap="test">make check</userinput></screen> +<screen><userinput remap="test">make -k check</userinput></screen> <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory. If you do not have significantly more RAM than this, it diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index 684cd3060..0fc5cb286 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -43,6 +43,10 @@ <sect2 role="installation"> <title>Installation of Gettext</title> + <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para> + +<screen><userinput remap="pre">sed -i -e '/gets is a/d' gettext-*/*/stdio.in.h</userinput></screen> + <para>Prepare Gettext for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr \ diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 984c7dcea..72a73115b 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -72,7 +72,11 @@ <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>Fix a bug that causes the build to fail:</para> + +<screen><userinput remap="pre">sed -i 's#<rpc/types.h>#"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 @@ -82,15 +86,14 @@ <screen><userinput remap="pre">DL=$(readelf -l /bin/sh | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p') sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \ scripts/test-installation.pl -unset DL</userinput></screen> +unset DL</userinput></screen>--> - <para>In addition, there is a bug in the - <filename>test-installation.pl</filename> script in that it tries to link - a test program to a library that isn't installed by - <command>make install</command>. Issue the following <command>sed</command> - command to fix it:</para> + <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, it contains a bug that causes it to + fail, so prevent it from running by issuing the following command:</para> - <screen><userinput remap="pre">sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl</userinput></screen> +<screen><userinput remap="pre">sed -i '/test-installation.pl/d' Makefile</userinput></screen> <para>The <command>ldd</command> shell script contains Bash-specific syntax. Change its default program interpreter to <command>/bin/bash</command> @@ -100,12 +103,6 @@ unset DL</userinput></screen> <screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen> - <para>Fix a bug that causes several BLFS packages to segfault:</para> -<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fixes-patch;</userinput></screen> - - <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para> -<screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen> - <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> @@ -315,6 +312,16 @@ rpc: files # End /etc/nsswitch.conf</literal> EOF</userinput></screen> + <para>Install timezone data:</para> +<screen><userinput>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</userinput></screen> + <para>One way to determine the local time zone, run the following script:</para> 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 @@ <sect2 role="installation"> <title>Installation of GRUB</title> + <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para> + +<screen><userinput remap="pre">sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h</userinput></screen> + <para>Prepare GRUB for compilation:</para> <screen><userinput remap="configure">./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 @@ <sect2 role="installation"> <title>Installation of Inetutils</title> + <para>Fix an incompatibility between this package and Glibc-&glibc-version;</para> + +<screen><userinput remap="pre">sed -i -e '/gets is a/d' lib/stdio.in.h</userinput></screen> + + <para>Prepare Inetutils for compilation:</para> + <screen><userinput remap="configure">./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 @@ <sect2 role="installation"> <title>Installation of Libpipeline</title> + <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para> + +<screen><userinput remap="pre">sed -i -e '/gets is a/d' gnulib/lib/stdio.in.h</userinput></screen> + <para>Prepare Libpipeline for compilation:</para> <screen><userinput remap="configure">PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr</userinput></screen> 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 @@ <sect2 role="installation"> <title>Installation of M4</title> + <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para> + +<screen><userinput remap="pre">sed -i -e '/gets is a/d' lib/stdio.in.h</userinput></screen> + <para>Prepare M4 for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> 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 @@ <sect2 role="installation"> <title>Installation of Man-DB</title> + <para>Fix an incompatibility between this package and Glibc-&glibc-version;</para> + +<screen><userinput remap="pre">sed -i -e '/gets is a/d' gnulib/lib/stdio.in.h</userinput></screen> + <para>Prepare Man-DB for compilation:</para> <screen><userinput remap="configure">./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 @@ <para>To test the results, issue:</para> -<screen><userinput remap="test">make check</userinput></screen> +<screen><userinput remap="test">make -k check</userinput></screen> <para>Install the package:</para> 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 @@ </variablelist> + <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para> + +<screen><userinput remap="pre">sed -i '/test-installation.pl/d' Makefile</userinput></screen> + <para>Compile the package:</para> <screen><userinput remap="make">make</userinput></screen> <para>To test the results (approximately 2.5 SBU), issue:</para> -<screen><userinput remap="test">make test</userinput></screen> +<screen><userinput remap="test">make -k test</userinput></screen> <para>Install the package:</para> 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 @@ <sect2 role="installation"> <title>Installation of Tar</title> + <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para> + +<screen><userinput remap="pre">sed -i -e '/gets is a/d' gnu/stdio.in.h</userinput></screen> + <para>Prepare Tar for compilation:</para> <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 \ |