aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/binutils-pass2.xml16
-rw-r--r--chapter06/coreutils.xml13
-rw-r--r--chapter06/ncurses.xml6
3 files changed, 15 insertions, 20 deletions
diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml
index 7b0f1fc20..983aaee2f 100644
--- a/chapter06/binutils-pass2.xml
+++ b/chapter06/binutils-pass2.xml
@@ -43,11 +43,17 @@
<sect2 role="installation">
<title>Installation of Binutils</title>
- <!-- Don't remove this until Binutils upstream updates the libtool
- copy. On some host distros the issue doesn't show up. -->
- <para>Binutils ships an outdated copy of libtool in the tarball. It lacks
- sysroot support, so the produced binaries will be mistakenly linked to
- libraries from the host distro. Work around this issue:</para>
+ <!-- Don't remove this until Binutils upstream resolves this issue.
+ We can test by building Binutils on a complete system with
+ zlib (libz.so) installed, passing enable-shared and
+ without-system-zlib. If the resulted libctf.so still links against
+ libz.so (check with readelf -d) despite we are saying
+ without-system-zlib, then the issue is still unresolved. -->
+ <para>Binutils building system relies on an shipped libtool copy to link against
+ internal static libraries, but the libiberty and zlib copies shipped
+ in the package do not use libtool. This inconsistency may cause
+ produced binaries mistakenly linked against libraries from the host
+ distro. Work around this issue:</para>
<screen><userinput remap="pre">sed '6009s/$add_dir//' -i ltmain.sh</userinput></screen>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index d3afe3918..f6b6c6310 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -43,17 +43,13 @@
<sect2 role="installation">
<title>Installation of Coreutils</title>
-<!--
-<screen><userinput remap="configure">export gl_cv_macro_MB_CUR_MAX_good=y</userinput></screen>
--->
<para>Prepare Coreutils for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
--host=$LFS_TGT \
--build=$(build-aux/config.guess) \
--enable-install-program=hostname \
- --enable-no-install-program=kill,uptime \
- gl_cv_macro_MB_CUR_MAX_good=y</userinput></screen>
+ --enable-no-install-program=kill,uptime</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -67,13 +63,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term><envar>gl_cv_macro_MB_CUR_MAX_good=y</envar></term>
- <listitem>
- <para>This is needed to work around an issue in the gnulib copy
- shipped by the package which would break cross compilation.</para>
- </listitem>
- </varlistentry>
</variablelist>
<para>Compile the package:</para>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 9e7764ecf..8d7c8b1fe 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -78,7 +78,7 @@ popd</userinput></screen>
<varlistentry>
<term><parameter>--with-manpage-format=normal</parameter></term>
<listitem>
- <para>This prevents Ncurses installing compressed manual
+ <para>This prevents Ncurses from installing compressed manual
pages, which may happen if the host distribution itself
has compressed manual pages.</para>
</listitem>
@@ -94,7 +94,7 @@ popd</userinput></screen>
<varlistentry>
<term><parameter>--without-normal</parameter></term>
<listitem>
- <para>This prevents Ncurses building and installing static C
+ <para>This prevents Ncurses from building and installing static C
libraries.</para>
</listitem>
</varlistentry>
@@ -102,7 +102,7 @@ popd</userinput></screen>
<varlistentry>
<term><parameter>--without-debug</parameter></term>
<listitem>
- <para>This prevents Ncurses building and installing debug
+ <para>This prevents Ncurses from building and installing debug
libraries.</para>
</listitem>
</varlistentry>