aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/binutils.xml9
-rw-r--r--chapter06/glibc.xml9
-rw-r--r--chapter06/make.xml3
-rw-r--r--chapter06/vim.xml1
4 files changed, 19 insertions, 3 deletions
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 3cc7ae0a5..4435db7e9 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -71,6 +71,7 @@ cd build</userinput></screen>
--enable-plugins \
--enable-shared \
--disable-werror \
+ --enable-64-bit-bfd \
--with-system-zlib</userinput></screen>
<variablelist>
<title>The meaning of the configure parameters:</title>
@@ -99,6 +100,14 @@ cd build</userinput></screen>
</varlistentry>
<varlistentry>
+ <term><parameter>--enable-64-bit-bfd</parameter></term>
+ <listitem>
+ <para>Enables 64-bit support (on hosts with narrower word sizes).
+ May not be needed on 64-bit systems, but does no harm.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><parameter>--with-system-zlib</parameter></term>
<listitem>
<para>Use the installed zlib library rather than building the
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 07cbe969d..2a74215f4 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -56,16 +56,21 @@
store their runtime data in the FHS-compliant locations:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
-
+<!--
<para>Fix a minor security issue with glob functions:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&glibc-glob-patch;</userinput></screen>
-
+-->
<para>First create a compatibility symlink to avoid references to /tools in
our final glibc:</para>
<screen><userinput remap="pre">ln -sfv /tools/lib/gcc /usr/lib</userinput></screen>
+ <para>Now work around a problem caused by a hard-coded path to an
+ executable program:</para>
+
+<screen><userinput remap="pre">ln -sfv /tools/bin/m4 /usr/bin</userinput></screen>
+
<para>Determine the GCC include directory and create a symlink for LSB
compliance. Additionally, for x86_64, create a compatibility symlink
required for the dynamic loader to function correctly:</para>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index f88105c01..e52fff2cf 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,6 +40,9 @@
<sect2 role="installation">
<title>Installation of Make</title>
+ <para>Again, work around an error caused by glibc-2.27:</para>
+
+<screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
<para>Prepare Make for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index fa2bad722..a11068a54 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -140,7 +140,6 @@ if (&amp;term == "xterm") || (&amp;term == "putty")
set background=dark
endif
-
" End /etc/vimrc</literal>
EOF</userinput></screen>