diff options
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter05/binutils-pass1.xml | 21 | ||||
| -rw-r--r-- | chapter05/binutils-pass2.xml | 6 | ||||
| -rw-r--r-- | chapter05/gcc-pass1.xml | 10 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 6 | ||||
| -rw-r--r-- | chapter05/generalinstructions.xml | 4 | ||||
| -rw-r--r-- | chapter05/glibc.xml | 10 | ||||
| -rw-r--r-- | chapter05/libstdc++.xml | 8 | ||||
| -rw-r--r-- | chapter06/binutils.xml | 14 | ||||
| -rw-r--r-- | chapter06/gcc.xml | 22 | ||||
| -rw-r--r-- | chapter06/glibc.xml | 21 | ||||
| -rw-r--r-- | general.ent | 4 |
12 files changed, 71 insertions, 66 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e6b9bfeab..3f3e2b59f 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,17 @@ </listitem> --> <listitem> + <para>2016-01-27</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Move external build directories into + dedicated build directories inside the source tree for + binutils, gcc, and glibc.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2016-01-24</para> <itemizedlist> <listitem> diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index decec8b6f..ec3861eea 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -52,11 +52,11 @@ linker and assembler to determine which of their own features to enable.</para> - <para>The Binutils documentation recommends building Binutils outside of the - source directory in a dedicated build directory:</para> + <para>The Binutils documentation recommends building Binutils + in a dedicated build directory:</para> -<screen><userinput remap="pre">mkdir -v ../binutils-build -cd ../binutils-build</userinput></screen> +<screen><userinput remap="pre">mkdir -v build +cd build</userinput></screen> <note> <para>In order for the SBU values listed in the rest of the book @@ -72,13 +72,12 @@ cd ../binutils-build</userinput></screen> <para>Now prepare Binutils for compilation:</para> -<screen><userinput remap="configure">../binutils-&binutils-version;/configure \ - --prefix=/tools \ - --with-sysroot=$LFS \ - --with-lib-path=/tools/lib \ - --target=$LFS_TGT \ - --disable-nls \ - --disable-werror</userinput></screen> +<screen><userinput remap="configure">../configure --prefix=/tools \ + --with-sysroot=$LFS \ + --with-lib-path=/tools/lib \ + --target=$LFS_TGT \ + --disable-nls \ + --disable-werror</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index 182fad342..080c50916 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -45,15 +45,15 @@ <para>Create a separate build directory again:</para> -<screen><userinput remap="pre">mkdir -v ../binutils-build -cd ../binutils-build</userinput></screen> +<screen><userinput remap="pre">mkdir -v build +cd build</userinput></screen> <para>Prepare Binutils for compilation:</para> <screen><userinput remap="configure">CC=$LFS_TGT-gcc \ AR=$LFS_TGT-ar \ RANLIB=$LFS_TGT-ranlib \ -../binutils-&binutils-version;/configure \ +../configure \ --prefix=/tools \ --disable-nls \ --disable-werror \ diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index da6ea0743..8015c1b50 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -111,15 +111,15 @@ done</userinput></screen> <screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&\& \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen> --> - <para>The GCC documentation recommends building GCC outside of the - source directory in a dedicated build directory:</para> + <para>The GCC documentation recommends building GCC + in a dedicated build directory:</para> -<screen><userinput remap="pre">mkdir -v ../gcc-build -cd ../gcc-build</userinput></screen> +<screen><userinput remap="pre">mkdir -v build +cd build</userinput></screen> <para>Prepare GCC for compilation:</para> -<screen><userinput remap="configure">../gcc-&gcc-version;/configure \ +<screen><userinput remap="configure">../configure \ --target=$LFS_TGT \ --prefix=/tools \ --with-glibc-version=2.11 \ diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index ec460e482..a8844ed7d 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -101,8 +101,8 @@ mv -v mpc-&mpc-version; mpc</userinput></screen> --> <para>Create a separate build directory again:</para> -<screen><userinput remap="pre">mkdir -v ../gcc-build -cd ../gcc-build</userinput></screen> +<screen><userinput remap="pre">mkdir -v build +cd build</userinput></screen> <para>Before starting to build GCC, remember to unset any environment variables that override the default optimization flags.</para> @@ -113,7 +113,7 @@ cd ../gcc-build</userinput></screen> CXX=$LFS_TGT-g++ \ AR=$LFS_TGT-ar \ RANLIB=$LFS_TGT-ranlib \ -../gcc-&gcc-version;/configure \ +../configure \ --prefix=/tools \ --with-local-prefix=/tools \ --with-native-system-header-dir=/tools/include \ diff --git a/chapter05/generalinstructions.xml b/chapter05/generalinstructions.xml index 72f460066..d2f5d61af 100644 --- a/chapter05/generalinstructions.xml +++ b/chapter05/generalinstructions.xml @@ -107,9 +107,7 @@ <para>Change back to the sources directory.</para> </listitem> <listitem> - <para>Delete the extracted source directory and any - <filename class="directory"><replaceable><package></replaceable>-build</filename> - directories that were created in the build process unless instructed otherwise.</para> + <para>Delete the extracted source directory unless instructed otherwise.</para> </listitem> </orderedlist> </listitem> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 61e2d965c..a7278e337 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -47,15 +47,15 @@ <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen> - <para>The Glibc documentation recommends building Glibc outside of the source - directory in a dedicated build directory:</para> + <para>The Glibc documentation recommends building Glibc + in a dedicated build directory:</para> -<screen><userinput remap="pre">mkdir -v ../glibc-build -cd ../glibc-build</userinput></screen> +<screen><userinput remap="pre">mkdir -v build +cd build</userinput></screen> <para>Next, prepare Glibc for compilation:</para> -<screen><userinput remap="configure">../glibc-&glibc-version;/configure \ +<screen><userinput remap="configure">../configure \ --prefix=/tools \ --host=$LFS_TGT \ --build=$(../glibc-&glibc-version;/scripts/config.guess) \ diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml index 365babb3a..f3ac79de6 100644 --- a/chapter05/libstdc++.xml +++ b/chapter05/libstdc++.xml @@ -48,14 +48,14 @@ <filename>gcc-&gcc-version;</filename> directory.</para> </note> - <para>Create a directory for Libstdc++ and enter it:</para> + <para>Create a separate build directory for Libstdc++ and enter it:</para> -<screen><userinput remap="pre">mkdir -v ../gcc-build -cd ../gcc-build</userinput></screen> +<screen><userinput remap="pre">mkdir -v build +cd build</userinput></screen> <para>Prepare Libstdc++ for compilation:</para> -<screen><userinput remap="configure">../gcc-&gcc-version;/libstdc++-v3/configure \ +<screen><userinput remap="configure">../libstdc++-v3/configure \ --host=$LFS_TGT \ --prefix=/tools \ --disable-multilib \ diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index c41d62289..fb9dc4b31 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -65,17 +65,17 @@ Ask your system administrator to create more.</computeroutput></screen> <screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen> --> - <para>The Binutils documentation recommends building Binutils outside of the - source directory in a dedicated build directory:</para> + <para>The Binutils documentation recommends building Binutils + in a dedicated build directory:</para> -<screen><userinput remap="pre">mkdir -v ../binutils-build -cd ../binutils-build</userinput></screen> +<screen><userinput remap="pre">mkdir -v build +cd build</userinput></screen> <para>Prepare Binutils for compilation:</para> -<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr \ - --enable-shared \ - --disable-werror</userinput></screen> +<screen><userinput remap="configure">../configure --prefix=/usr \ + --enable-shared \ + --disable-werror</userinput></screen> <para>Compile the package:</para> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index afae54041..1be390ab4 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -45,21 +45,19 @@ <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen> --> - <para>The GCC documentation recommends building GCC outside of the source - directory in a dedicated build directory:</para> + <para>The GCC documentation recommends building GCC in a dedicated build directory:</para> -<screen><userinput remap="pre">mkdir -v ../gcc-build -cd ../gcc-build</userinput></screen> +<screen><userinput remap="pre">mkdir -v build +cd build</userinput></screen> <para>Prepare GCC for compilation:</para> -<screen><userinput remap="configure">SED=sed \ -../gcc-&gcc-version;/configure \ - --prefix=/usr \ - --enable-languages=c,c++ \ - --disable-multilib \ - --disable-bootstrap \ - --with-system-zlib</userinput></screen> +<screen><userinput remap="configure">SED=sed \ +../configure --prefix=/usr \ + --enable-languages=c,c++ \ + --disable-multilib \ + --disable-bootstrap \ + --with-system-zlib</userinput></screen> <para>Note that for other languages, there are some prerequisites that are not yet available. See the @@ -106,7 +104,7 @@ cd ../gcc-build</userinput></screen> <para>To receive a summary of the test suite results, run:</para> -<screen><userinput remap="test">../gcc-&gcc-version;/contrib/test_summary</userinput></screen> +<screen><userinput remap="test">../contrib/test_summary</userinput></screen> <para>For only the summaries, pipe the output through <userinput>grep -A7 Summ</userinput>.</para> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 1cbaf232a..a78d81ee7 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -77,19 +77,18 @@ <screen><userinput remap="pre">patch -Np1 -i ../&glibc-largefile-patch;</userinput></screen> - <para>The Glibc documentation recommends building Glibc outside of the source - directory in a dedicated build directory:</para> + <para>The Glibc documentation recommends building Glibc + in a dedicated build directory:</para> -<screen><userinput remap="pre">mkdir -v ../glibc-build -cd ../glibc-build</userinput></screen> +<screen><userinput remap="pre">mkdir -v build +cd build</userinput></screen> <para>Prepare Glibc for compilation:</para> -<screen><userinput remap="configure">../glibc-&glibc-version;/configure \ - --prefix=/usr \ - --disable-profile \ - --enable-kernel=&min-kernel; \ - --enable-obsolete-rpc</userinput></screen> +<screen><userinput remap="configure">../configure --prefix=/usr \ + --disable-profile \ + --enable-kernel=&min-kernel; \ + --enable-obsolete-rpc</userinput></screen> <para>Compile the package:</para> @@ -170,7 +169,7 @@ cd ../glibc-build</userinput></screen> <para>Install the configuration file and runtime directory for <command>nscd</command>:</para> -<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf +<screen><userinput remap="install">cp -v ../nscd/nscd.conf /etc/nscd.conf mkdir -pv /var/cache/nscd</userinput></screen> <para>The locales that can make the system respond in a different language @@ -274,7 +273,7 @@ EOF</userinput></screen> <title>Adding time zone data</title> <para>Install and set up the time zone data with the following:</para> -<screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz +<screen><userinput>tar -xf ../../tzdata&tzdata-version;.tar.gz ZONEINFO=/usr/share/zoneinfo mkdir -pv $ZONEINFO/{posix,right} diff --git a/general.ent b/general.ent index e9dcd00bf..f0f08f892 100644 --- a/general.ent +++ b/general.ent @@ -1,7 +1,7 @@ -<!ENTITY version "SVN-20160124"> +<!ENTITY version "SVN-20160127"> <!ENTITY short-version "svn"> <!-- Used below in &blfs-book;. Change to x.y for release but not -rc releases --> -<!ENTITY releasedate "January 24, 2016"> +<!ENTITY releasedate "January 27, 2016"> <!ENTITY copyrightdate "1999-2016"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.9"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |