aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Labastie <pierre.labastie@neuf.fr>2021-09-16 09:37:01 +0200
committerPierre Labastie <pierre.labastie@neuf.fr>2021-09-16 09:37:01 +0200
commit4809582902edddeff30dae6693447382ef69f3db (patch)
tree9227a810ce6a214304d72b526720817ff64a8a29
parent3c5b3f98c3a86e991de24def2e058f9b8045f3b5 (diff)
parent43b6ecdc1fd6df576cba795798d35dc72fd6d557 (diff)
Merge branch 'trunk' into plabs/condxml
-rw-r--r--chapter03/introduction.xml8
-rw-r--r--chapter05/gcc-pass1.xml38
2 files changed, 27 insertions, 19 deletions
diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml
index 63ec046b5..d535b644e 100644
--- a/chapter03/introduction.xml
+++ b/chapter03/introduction.xml
@@ -74,6 +74,14 @@
<screen role="nodump"><userinput>wget --input-file=wget-list --continue --directory-prefix=$LFS/sources</userinput></screen>
+ <note><para>
+ The <filename>wget-list</filename> file mentioned above retrieves all
+ packages for both the sysV and systemd versions of LFS. There are a total
+ of five additional small packages not needed for the currrent book. The
+ <filename>md5sums</filename> file mentioned below is specific to the
+ current book.
+ </para></note>
+
<para>Additionally, starting with LFS-7.0, there is a separate file,
<ulink url="../md5sums">md5sums</ulink>, which can be used to verify that all
the correct packages are available before proceeding. Place that file in
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 1ff7d50fe..765f5b875 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -80,25 +80,25 @@ cd build</userinput></screen>
<para>Prepare GCC for compilation:</para>
-<screen><userinput remap="configure">../configure \
- --target=$LFS_TGT \
- --prefix=$LFS/tools \
- --with-glibc-version=2.11 \
- --with-sysroot=$LFS \
- --with-newlib \
- --without-headers \
- --enable-initfini-array \
- --disable-nls \
- --disable-shared \
- --disable-multilib \
- --disable-decimal-float \
- --disable-threads \
- --disable-libatomic \
- --disable-libgomp \
- --disable-libquadmath \
- --disable-libssp \
- --disable-libvtv \
- --disable-libstdcxx \
+<screen><userinput remap="configure">../configure \
+ --target=$LFS_TGT \
+ --prefix=$LFS/tools \
+ --with-glibc-version=2.11 \
+ --with-sysroot=$LFS \
+ --with-newlib \
+ --without-headers \
+ --enable-initfini-array \
+ --disable-nls \
+ --disable-shared \
+ --disable-multilib \
+ --disable-decimal-float \
+ --disable-threads \
+ --disable-libatomic \
+ --disable-libgomp \
+ --disable-libquadmath \
+ --disable-libssp \
+ --disable-libvtv \
+ --disable-libstdcxx \
--enable-languages=c,c++</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>