aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2016-08-06 03:53:06 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2016-08-06 03:53:06 +0000
commit12836f58d2db3fc47b91c4b544daa9f17b25c56c (patch)
tree3a1627b11195a9185c2649fd5b17fd9d5da8a744 /chapter06
parent8064ca2674941cd3262a2a6df9b6536fc7b2e8e0 (diff)
Update to grub-2.02~beta3.
Update to glibc-2.24. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11100 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/gcc.xml4
-rw-r--r--chapter06/glibc.xml20
-rw-r--r--chapter06/sysklogd.xml8
3 files changed, 11 insertions, 21 deletions
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index f89a810a9..e7b735914 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -41,6 +41,10 @@
<sect2 role="installation">
<title>Installation of GCC</title>
+ <para>First fix a problem identified upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../gcc-6.1.0-asan-1.patch</userinput></screen>
+
<para>The GCC documentation recommends building GCC in a dedicated build directory:</para>
<screen><userinput remap="pre">mkdir -v build
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 02abb3dad..61a2374ef 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -42,18 +42,7 @@
<sect2 role="installation">
<title>Installation of Glibc</title>
-<!--
- <note>
- <para>Some packages outside of LFS suggest installing GNU libiconv in
- order to translate data from one encoding to another. The project's
- home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
- <quote>This library provides an <function>iconv()</function>
- implementation, for use on systems which don't have one, or whose
- implementation cannot convert from/to Unicode.</quote> Glibc provides
- an <function>iconv()</function> implementation and can convert from/to
- Unicode, therefore libiconv is not required on an LFS system.</para>
- </note>
--->
+
<note><para>The Glibc build system is self-contained and will install
perfectly, even though the compiler specs file and linker are still
pointing to <filename class="directory">/tools</filename>. The specs
@@ -68,10 +57,6 @@
<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
- <para>Fix some problems identified upstream:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
-
<para>The Glibc documentation recommends building Glibc
in a dedicated build directory:</para>
@@ -105,8 +90,7 @@ cd build</userinput></screen>
<itemizedlist>
<listitem>
- <para><emphasis>posix/tst-getaddrinfo4</emphasis> and
- <emphasis>posix/tst-getaddrinfo5</emphasis> will always fail due
+ <para><emphasis>posix/tst-getaddrinfo4</emphasis> will always fail due
to not having the necessary networking applications when the tests are
run.</para>
</listitem>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index d4cf68ecb..f2f25a9a2 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -41,10 +41,12 @@
<sect2 role="installation">
<title>Installation of Sysklogd</title>
- <para>First, fix a problem that causes a segmentation fault under
- some conditions in klogd:</para>
+ <para>First, fix problems that causes a segmentation fault under
+ some conditions in klogd and fix an obsolete program construct:</para>
-<screen><userinput remap="pre">sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c</userinput></screen>
+<screen><userinput remap="pre">sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c
+sed -i 's/union wait/int*/' syslogd.c
+</userinput></screen>
<para>Compile the package:</para>