diff options
author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2017-08-14 22:28:28 +0000 |
---|---|---|
committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2017-08-14 22:28:28 +0000 |
commit | ffbeb5fc6b4f1ef0bd03440a3a935b8127d511ad (patch) | |
tree | a18ff7a212e87484d828a9217a89ea8fb30c2d41 /chapter06 | |
parent | b485746388fcd4afa65339bcdac33949497b68b0 (diff) |
Update to gcc-7.2.0.
Update to linux-4.12.7.
Update to glibc-2.26.
Update to dbus-1.10.22.
Update to binutils-2.29.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11279 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r-- | chapter06/automake.xml | 3 | ||||
-rw-r--r-- | chapter06/flex.xml | 8 | ||||
-rw-r--r-- | chapter06/glibc.xml | 17 | ||||
-rw-r--r-- | chapter06/gzip.xml | 3 |
4 files changed, 23 insertions, 8 deletions
diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 996592f80..5dc6295d6 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -58,7 +58,8 @@ <screen><userinput remap="test">sed -i "s:./configure:LEXLIB=/usr/lib/libfl.a &:" t/lex-{clean,depend}-cxx.sh make -j4 check</userinput></screen> - <para>Three tests are known to fail in the LFS environment.</para> + <para>Three tests are known to fail in the LFS environment: + check12.sh, subobj.sh, and check12-w.sh.</para> <para>Install the package:</para> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 64e000287..4055d4857 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -40,11 +40,11 @@ <sect2 role="installation"> <title>Installation of Flex</title> -<!-- - <para>First, fix a problem with the latest version:</para> -<screen><userinput remap="pre">patch -Np1 -i ../&flex-fixes-patch;</userinput></screen> ---> + <para>First, fix a problem introduced with glibc-2.26:</para> + +<screen><userinput remap="pre">sed -i "/math.h/a #include <malloc.h>" src/flexdef.h</userinput></screen> + <para>The build procedure assumes the <application>help2man</application> program is available to create a man page from the executable --help option. This is not present, so we use an environment variable to skip this process. diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 5ef90aaeb..e972cb623 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -68,14 +68,19 @@ <screen><userinput remap="pre">case $(uname -m) in i?86) GCC_INCDIR=/usr/lib/gcc/$(uname -m)-pc-linux-gnu/&gcc-version;/include - ln -s ld-linux.so.2 /lib/ld-lsb.so.3 + ln -sfv ld-linux.so.2 /lib/ld-lsb.so.3 ;; x86_64) GCC_INCDIR=/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include - ln -s ../lib/ld-linux-x86-64.so.2 /lib64 - ln -s ../lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3 + ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64 + ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3 ;; esac</userinput></screen> + <para>Remove a file that may be left over from a previous build attempt: + </para> + +<screen><userinput remap="pre">rm -f /usr/include/limits.h</userinput></screen> + <para>The Glibc documentation recommends building Glibc in a dedicated build directory:</para> @@ -198,6 +203,12 @@ unset GCC_INCDIR</userinput></screen> <screen><userinput remap="install">touch /etc/ld.so.conf</userinput></screen> + <para>Fix the generated Makefile to skip an uneeded sanity check + that fails in the LFS partial environment: + </para> + +<screen><userinput remap="install">sed '/test-installation/s@$(PERL)@echo not running@' -i ../Makefile</userinput></screen> + <para>Install the package:</para> <screen><userinput remap="install">make install</userinput></screen> diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index e7dd7d2b0..09eebbdf7 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -53,6 +53,9 @@ <screen><userinput remap="test">make check</userinput></screen> + <para>Two tests are known to fail in the LFS environment: + help-version and zmore.</para> + <para>Install the package:</para> <screen><userinput remap="install">make install</userinput></screen> |