diff options
Diffstat (limited to 'chapter05')
| -rw-r--r-- | chapter05/bash.xml | 15 | ||||
| -rw-r--r-- | chapter05/binutils-pass1.xml | 10 | ||||
| -rw-r--r-- | chapter05/binutils-pass2.xml | 13 | ||||
| -rw-r--r-- | chapter05/bison.xml | 11 | ||||
| -rw-r--r-- | chapter05/bzip2.xml | 4 | ||||
| -rw-r--r-- | chapter05/coreutils.xml | 18 | ||||
| -rw-r--r-- | chapter05/dejagnu.xml | 9 | ||||
| -rw-r--r-- | chapter05/diffutils.xml | 6 | ||||
| -rw-r--r-- | chapter05/expect.xml | 17 | ||||
| -rw-r--r-- | chapter05/findutils.xml | 11 | ||||
| -rw-r--r-- | chapter05/flex.xml | 15 | ||||
| -rw-r--r-- | chapter05/gawk.xml | 13 | ||||
| -rw-r--r-- | chapter05/gcc-pass1.xml | 10 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 18 | ||||
| -rw-r--r-- | chapter05/gettext.xml | 6 | ||||
| -rw-r--r-- | chapter05/glibc.xml | 14 | ||||
| -rw-r--r-- | chapter05/grep.xml | 11 | ||||
| -rw-r--r-- | chapter05/gzip.xml | 13 | ||||
| -rw-r--r-- | chapter05/linux-headers.xml | 2 | ||||
| -rw-r--r-- | chapter05/m4.xml | 11 | ||||
| -rw-r--r-- | chapter05/make.xml | 11 | ||||
| -rw-r--r-- | chapter05/ncurses.xml | 6 | ||||
| -rw-r--r-- | chapter05/patch.xml | 6 | ||||
| -rw-r--r-- | chapter05/perl.xml | 12 | ||||
| -rw-r--r-- | chapter05/sed.xml | 11 | ||||
| -rw-r--r-- | chapter05/tar.xml | 11 | ||||
| -rw-r--r-- | chapter05/tcl.xml | 17 | ||||
| -rw-r--r-- | chapter05/texinfo.xml | 11 | ||||
| -rw-r--r-- | chapter05/util-linux.xml | 10 |
29 files changed, 171 insertions, 151 deletions
diff --git a/chapter05/bash.xml b/chapter05/bash.xml index b1577517c..d55f01d0e 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -46,11 +46,11 @@ <para>Apply fixes for several bugs discovered since the initial release of Bash-&bash-version;:</para> -<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> <para>Prepare Bash for compilation:</para> -<screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc</userinput></screen> <variablelist> <title>The meaning of the configure option:</title> @@ -70,19 +70,20 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make tests</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make tests</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Make a link for the programs that use <command>sh</command> for a shell:</para> -<screen><userinput>ln -vs bash /tools/bin/sh</userinput></screen> +<screen><userinput remap="install">ln -vs bash /tools/bin/sh</userinput></screen> </sect2> diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index 4c10d154b..09c2e0a30 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -51,7 +51,7 @@ <para>The Binutils documentation recommends building Binutils outside of the source directory in a dedicated build directory:</para> -<screen><userinput>mkdir -v ../binutils-build +<screen><userinput remap="pre">mkdir -v ../binutils-build cd ../binutils-build</userinput></screen> <note> @@ -65,7 +65,7 @@ cd ../binutils-build</userinput></screen> <para>Now prepare Binutils for compilation:</para> -<screen><userinput>CC="gcc -B/usr/bin/" ../binutils-&binutils-version;/configure \ +<screen><userinput remap="configure">CC="gcc -B/usr/bin/" ../binutils-&binutils-version;/configure \ --prefix=/tools --disable-nls --disable-werror</userinput></screen> <variablelist> @@ -111,7 +111,7 @@ cd ../binutils-build</userinput></screen> <para>Continue with compiling the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Compilation is now complete. Ordinarily we would now run the test suite, but at this early stage the test suite framework (Tcl, @@ -121,12 +121,12 @@ cd ../binutils-build</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Next, prepare the linker for the <quote>Adjusting</quote> phase later on:</para> -<screen><userinput>make -C ld clean +<screen><userinput remap="adjust">make -C ld clean make -C ld LIB_PATH=/tools/lib cp -v ld/ld-new /tools/bin</userinput></screen> diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index db4ebdd6b..d0c7a5ac5 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -45,12 +45,12 @@ <para>Create a separate build directory again:</para> -<screen><userinput>mkdir -v ../binutils-build +<screen><userinput remap="pre">mkdir -v ../binutils-build cd ../binutils-build</userinput></screen> <para>Prepare Binutils for compilation:</para> -<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \ +<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/tools \ --disable-nls --with-lib-path=/tools/lib</userinput></screen> <variablelist> @@ -71,27 +71,26 @@ cd ../binutils-build</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Compilation is now complete. As discussed earlier, running the test suite is not mandatory for the temporary tools here in this chapter. To run the Binutils test suite anyway, issue the following command:</para> -<screen><userinput>make check</userinput></screen> +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Now prepare the linker for the <quote>Re-adjusting</quote> phase in the next chapter:</para> -<screen><userinput>make -C ld clean +<screen><userinput remap="adjust">make -C ld clean make -C ld LIB_PATH=/usr/lib:/lib cp -v ld/ld-new /tools/bin</userinput></screen> - </sect2> <sect2 role="content"> diff --git a/chapter05/bison.xml b/chapter05/bison.xml index 316f2ea80..0240cfbc0 100644 --- a/chapter05/bison.xml +++ b/chapter05/bison.xml @@ -45,18 +45,19 @@ <para>Prepare Bison for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml index fe50bd4f9..cb53d7665 100644 --- a/chapter05/bzip2.xml +++ b/chapter05/bzip2.xml @@ -46,11 +46,11 @@ <para>The Bzip2 package does not contain a <command>configure</command> script. Compile and test it with:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Install the package:</para> -<screen><userinput>make PREFIX=/tools install</userinput></screen> +<screen><userinput remap="install">make PREFIX=/tools install</userinput></screen> </sect2> diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml index e52e60d85..8a35596a7 100644 --- a/chapter05/coreutils.xml +++ b/chapter05/coreutils.xml @@ -47,29 +47,31 @@ by Coreutils is incompatible with the version that current Glibc provides, so we'll rename the function:</para> -<screen><userinput>for file in src/{copy,touch}.c lib/utimens.{c,h} ; do \ +<screen><userinput remap="pre">for file in src/{copy,touch}.c lib/utimens.{c,h} ; do \ cp -v $file{,.orig} sed 's/futimens/gl_&/' $file.orig > $file done</userinput></screen> <para>Prepare Coreutils for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput>. The - <parameter>RUN_EXPENSIVE_TESTS=yes</parameter> parameter tells the + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make RUN_EXPENSIVE_TESTS=yes check</userinput></screen> + + <para>The <parameter>RUN_EXPENSIVE_TESTS=yes</parameter> parameter tells the test suite to run several additional tests that are considered relatively expensive (in terms of CPU power and memory usage) on some platforms, but generally are not a problem on Linux.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>The above command refuses to install <filename>su</filename> because it cannot install it setuid root as a non-privileged user. By @@ -78,7 +80,7 @@ done</userinput></screen> useful <command>su</command> from our host first place in our PATH. Install it with:</para> -<screen><userinput>cp -v src/su /tools/bin/su-tools</userinput></screen> +<screen><userinput remap="install">cp -v src/su /tools/bin/su-tools</userinput></screen> </sect2> diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml index bf0ca3e8b..bae0ed7d9 100644 --- a/chapter05/dejagnu.xml +++ b/chapter05/dejagnu.xml @@ -43,14 +43,15 @@ <para>Prepare DejaGNU for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Build and install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> </sect2> diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml index f2f3a2e61..cc76a3fd7 100644 --- a/chapter05/diffutils.xml +++ b/chapter05/diffutils.xml @@ -45,17 +45,17 @@ <para>Prepare Diffutils for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/expect.xml b/chapter05/expect.xml index 53b732a46..6b486f138 100644 --- a/chapter05/expect.xml +++ b/chapter05/expect.xml @@ -44,19 +44,19 @@ <para>First, fix a bug that can result in false failures during the GCC test suite run:</para> -<screen><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&expect-spawn-patch;</userinput></screen> <para>Next, force Expect's configure script to use <filename>/bin/stty</filename> instead of a <filename>/usr/local/bin/stty</filename> it may find on the host system. This will ensure that our testsuite tools remain sane for the final builds of our toolchain:</para> -<screen><userinput>cp configure{,.bak} +<screen><userinput remap="pre">cp configure{,.bak} sed 's:/usr/local/bin:/bin:' configure.bak > configure</userinput></screen> <para>Now prepare Expect for compilation:</para> -<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \ +<screen><userinput remap="configure">./configure --prefix=/tools --with-tcl=/tools/lib \ --with-tclinclude=/tools/include --with-x=no</userinput></screen> <variablelist> @@ -95,17 +95,20 @@ sed 's:/usr/local/bin:/bin:' configure.bak > configure</userinput></screen> <para>Build the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: <userinput>make test</userinput>. - Note that the Expect test suite is known to experience failures under + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make test</userinput></screen> + + <para>Note that the Expect test suite is known to experience failures under certain host conditions that are not within our control. Therefore, test suite failures here are not surprising and are not considered critical.</para> <para>Install the package:</para> -<screen><userinput>make SCRIPTS="" install</userinput></screen> +<screen><userinput remap="install">make SCRIPTS="" install</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml index e761b141a..c809b121e 100644 --- a/chapter05/findutils.xml +++ b/chapter05/findutils.xml @@ -45,18 +45,19 @@ <para>Prepare Findutils for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/flex.xml b/chapter05/flex.xml index 6521efc8b..b0974aeca 100644 --- a/chapter05/flex.xml +++ b/chapter05/flex.xml @@ -46,29 +46,30 @@ <para>Flex contains several known bugs. These can be fixed with the following patch:</para> -<screen><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&flex-fixes-patch;</userinput></screen> <para>The GNU autotools will detect that the Flex source code has been modified by the previous patch and tries to update the man page accordingly. This does not work on many systems, and the default page is fine, so make sure it does not get regenerated:</para> -<screen><userinput>touch doc/flex.1</userinput></screen> +<screen><userinput remap="pre">touch doc/flex.1</userinput></screen> <para>Now prepare Flex for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml index e54899b03..9a2ac64a3 100644 --- a/chapter05/gawk.xml +++ b/chapter05/gawk.xml @@ -45,28 +45,29 @@ <para>Prepare Gawk for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Due to a bug in the <command>configure</command> script, Gawk fails to detect certain aspects of locale support in Glibc. This bug leads to, e.g., Gettext testsuite failures. Work around this issue by appending the missing macro definitions to <filename>config.h</filename>:</para> -<screen><userinput>cat >> config.h << "EOF" +<screen><userinput remap="configure">cat >> config.h << "EOF" <literal>#define HAVE_LANGINFO_CODESET 1 #define HAVE_LC_MESSAGES 1</literal> EOF</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 5bbb78173..4589d28fe 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -46,12 +46,12 @@ <para>The GCC documentation recommends building GCC outside of the source directory in a dedicated build directory:</para> -<screen><userinput>mkdir -v ../gcc-build +<screen><userinput remap="pre">mkdir -v ../gcc-build cd ../gcc-build</userinput></screen> <para>Prepare GCC for compilation:</para> -<screen><userinput>CC="gcc -B/usr/bin/" ../gcc-&gcc-version;/configure --prefix=/tools \ +<screen><userinput remap="configure">CC="gcc -B/usr/bin/" ../gcc-&gcc-version;/configure --prefix=/tools \ --with-local-prefix=/tools --disable-nls --enable-shared \ --enable-languages=c</userinput></screen> @@ -109,7 +109,7 @@ cd ../gcc-build</userinput></screen> compiled correctly and is now the default configuration for the released package. Continue with compiling by running:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Compilation is now complete. At this point, the test suite would normally be run, but, as mentioned before, the test suite framework is @@ -119,7 +119,7 @@ cd ../gcc-build</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>As a finishing touch, create a symlink. Many programs and scripts run <command>cc</command> instead of <command>gcc</command>, which is @@ -128,7 +128,7 @@ cd ../gcc-build</userinput></screen> <command>cc</command> leaves the system administrator free to decide which C compiler to install:</para> -<screen><userinput>ln -vs gcc /tools/bin/cc</userinput></screen> +<screen><userinput remap="install">ln -vs gcc /tools/bin/cc</userinput></screen> </sect2> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 2be683d55..2dccf00f6 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -53,7 +53,7 @@ to see if the host system is set up correctly in this regard by performing a quick test:</para> -<screen><userinput>expect -c "spawn ls"</userinput></screen> +<screen><userinput remap="test">expect -c "spawn ls"</userinput></screen> <para>The response might be:</para> @@ -77,7 +77,7 @@ Ask your system administrator to create more.</computeroutput></screen> directory. The running of the <command>fixincludes</command> script can be suppressed by issuing the following commands:</para> -<screen><userinput>cp -v gcc/Makefile.in{,.orig} +<screen><userinput remap="pre">cp -v gcc/Makefile.in{,.orig} sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen> <para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/> @@ -86,7 +86,7 @@ sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userin <command>sed</command> to use it in order to ensure consistent compiler builds:</para> -<screen><userinput>cp -v gcc/Makefile.in{,.tmp} +<screen><userinput remap="pre">cp -v gcc/Makefile.in{,.tmp} sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ > gcc/Makefile.in</userinput></screen> @@ -99,7 +99,7 @@ sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ GCC. That is, all of the binaries created during the build will link against the new Glibc. Issue:</para> -<screen><userinput>for file in $(find gcc/config -name linux64.h -o -name linux.h) +<screen><userinput remap="pre">for file in $(find gcc/config -name linux64.h -o -name linux.h) do cp -uv $file{,.orig} sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \ @@ -126,7 +126,7 @@ done</userinput></screen> <para>Create a separate build directory again:</para> -<screen><userinput>mkdir -v ../gcc-build +<screen><userinput remap="pre">mkdir -v ../gcc-build cd ../gcc-build</userinput></screen> <para>Before starting to build GCC, remember to unset any environment @@ -134,7 +134,7 @@ cd ../gcc-build</userinput></screen> <para>Now prepare GCC for compilation:</para> -<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \ +<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/tools \ --with-local-prefix=/tools --enable-clocale=gnu \ --enable-shared --enable-threads=posix \ --enable-__cxa_atexit --enable-languages=c,c++ \ @@ -206,7 +206,7 @@ cd ../gcc-build</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>There is no need to use the <parameter>bootstrap</parameter> target now because the compiler being used to compile this GCC was built from @@ -216,7 +216,7 @@ cd ../gcc-build</userinput></screen> suites for the temporary tools compiled in this chapter is not mandatory. To run the GCC test suite anyway, use the following command:</para> -<screen><userinput>make -k check</userinput></screen> +<screen><userinput remap="test">make -k check</userinput></screen> <para>The <parameter>-k</parameter> flag is used to make the test suite run through to completion and not stop at the first failure. The GCC test @@ -228,7 +228,7 @@ cd ../gcc-build</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="adjusting.xml" diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml index 8774df7e6..67ac3b0a7 100644 --- a/chapter05/gettext.xml +++ b/chapter05/gettext.xml @@ -48,7 +48,7 @@ <para>Prepare Gettext for compilation:</para> -<screen><userinput>cd gettext-tools +<screen><userinput remap="configure">cd gettext-tools ./configure --prefix=/tools --disable-shared</userinput></screen> <variablelist> @@ -66,7 +66,7 @@ <para>Compile the package:</para> -<screen><userinput>make -C gnulib-lib +<screen><userinput remap="make">make -C gnulib-lib make -C src msgfmt</userinput></screen> <para>As only one binary has been compiled, it is not possible to run the @@ -76,7 +76,7 @@ make -C src msgfmt</userinput></screen> <para>Install the <command>msgfmt</command> binary:</para> -<screen><userinput>cp -v src/msgfmt /tools/bin</userinput></screen> +<screen><userinput remap="install">cp -v src/msgfmt /tools/bin</userinput></screen> </sect2> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index dd35ef1d3..ddf284375 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -46,7 +46,7 @@ <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> -<screen><userinput>mkdir -v ../glibc-build +<screen><userinput remap="pre">mkdir -v ../glibc-build cd ../glibc-build</userinput></screen> <para>Because Glibc no longer supports i386, its developers say to use the @@ -57,11 +57,11 @@ cd ../glibc-build</userinput></screen> for CFLAGS, append the new flag to the existing contents of CFLAGS by making use of the special file <filename>configparms</filename>:</para> -<screen><userinput>echo "CFLAGS += -march=i486" > configparms</userinput></screen> +<screen><userinput remap="configure">echo "CFLAGS += -march=i486" > configparms</userinput></screen> <para>Next, prepare Glibc for compilation:</para> -<screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \ +<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/tools \ --disable-profile --enable-add-ons \ --enable-kernel=2.6.0 --with-binutils=/tools/bin \ --without-gd --with-headers=/tools/include \ @@ -153,14 +153,14 @@ cd ../glibc-build</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Compilation is now complete. As mentioned earlier, running the test suites for the temporary tools installed in this chapter is not mandatory. To run the Glibc test suite (if desired), the following command will do so:</para> -<screen><userinput>make check</userinput></screen> +<screen><userinput remap="test">make check</userinput></screen> <para>For a discussion of test failures that are of particular importance, please see <xref linkend="ch-system-glibc" role="."/></para> @@ -184,12 +184,12 @@ cd ../glibc-build</userinput></screen> end about the absence of <filename>/tools/etc/ld.so.conf</filename>. Prevent this warning with:</para> -<screen><userinput>mkdir -v /tools/etc +<screen><userinput remap="install">mkdir -v /tools/etc touch /tools/etc/ld.so.conf</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Different countries and cultures have varying conventions for how to communicate. These conventions range from the format for diff --git a/chapter05/grep.xml b/chapter05/grep.xml index 12afa0819..46e3b1c42 100644 --- a/chapter05/grep.xml +++ b/chapter05/grep.xml @@ -45,7 +45,7 @@ <para>Prepare Grep for compilation:</para> -<screen><userinput>./configure --prefix=/tools \ +<screen><userinput remap="configure">./configure --prefix=/tools \ --disable-perl-regexp</userinput></screen> <variablelist> @@ -65,14 +65,15 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml index eb2c6a7c8..f8ce9d1a3 100644 --- a/chapter05/gzip.xml +++ b/chapter05/gzip.xml @@ -47,25 +47,26 @@ by Gzip is incompatible with the version that current Glibc provides, so we'll rename the function:</para> -<screen><userinput>for file in gzip.c lib/utimens.{c,h} ; do \ +<screen><userinput remap="pre">for file in gzip.c lib/utimens.{c,h} ; do \ cp -v $file{,.orig} sed 's/futimens/gl_&/' $file.orig > $file done</userinput></screen> <para>Prepare Gzip for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml index e7889a5fb..63063b7d6 100644 --- a/chapter05/linux-headers.xml +++ b/chapter05/linux-headers.xml @@ -50,7 +50,7 @@ <para>Install the header files:</para> -<screen><userinput>make mrproper +<screen><userinput remap="install">make mrproper make headers_check make INSTALL_HDR_PATH=dest headers_install cp -rv dest/include/* /tools/include</userinput></screen> diff --git a/chapter05/m4.xml b/chapter05/m4.xml index 54ff93360..8e3181cbe 100644 --- a/chapter05/m4.xml +++ b/chapter05/m4.xml @@ -45,18 +45,19 @@ <para>Prepare M4 for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/make.xml b/chapter05/make.xml index e525789d6..052df7931 100644 --- a/chapter05/make.xml +++ b/chapter05/make.xml @@ -44,18 +44,19 @@ <para>Prepare Make for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml index 18076761e..cb4cc2049 100644 --- a/chapter05/ncurses.xml +++ b/chapter05/ncurses.xml @@ -45,7 +45,7 @@ <para>Prepare Ncurses for compilation:</para> -<screen><userinput>./configure --prefix=/tools --with-shared \ +<screen><userinput remap="configure">./configure --prefix=/tools --with-shared \ --without-debug --without-ada --enable-overwrite</userinput></screen> <variablelist> @@ -75,13 +75,13 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/patch.xml b/chapter05/patch.xml index f285dd7be..de1ee7544 100644 --- a/chapter05/patch.xml +++ b/chapter05/patch.xml @@ -45,17 +45,17 @@ <para>Prepare Patch for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/perl.xml b/chapter05/perl.xml index 0885cbbec..ad27d07ce 100644 --- a/chapter05/perl.xml +++ b/chapter05/perl.xml @@ -46,18 +46,18 @@ <para>First adapt some hard-wired paths to the C library by applying the following patch:</para> -<screen><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&perl-libc-patch;</userinput></screen> <para>Fix an incompatibility with gcc-&gcc-version;:</para> -<screen><userinput>mv -v makedepend.SH{,.orig} +<screen><userinput remap="pre">mv -v makedepend.SH{,.orig} sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput></screen> <para>Prepare Perl for compilation (make sure to get the 'Data/Dumper Fcntl IO POSIX' part of the command correct—they are all letters):</para> -<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX'</userinput></screen> +<screen><userinput remap="configure">./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX'</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -67,7 +67,7 @@ sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput>< <listitem> <para>This tells Perl to build the minimum set of static extensions needed for installing and testing the Coreutils and Glibc packages in the - next chapter.</para> + next chapter.</para> </listitem> </varlistentry> @@ -76,7 +76,7 @@ sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput>< <para>Only a few of the utilities contained in this package need to be built:</para> -<screen><userinput>make perl utilities</userinput></screen> +<screen><userinput remap="make">make perl utilities</userinput></screen> <para>Although Perl comes with a test suite, it is not recommended to run it at this point. Only part of Perl was built and running @@ -86,7 +86,7 @@ sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput>< <para>Install these tools and their libraries:</para> -<screen><userinput>cp -v perl pod/pod2man /tools/bin +<screen><userinput remap="install">cp -v perl pod/pod2man /tools/bin mkdir -pv /tools/lib/perl5/&perl-version; cp -Rv lib/* /tools/lib/perl5/&perl-version;</userinput></screen> diff --git a/chapter05/sed.xml b/chapter05/sed.xml index 9dc8c37de..ed346ebdf 100644 --- a/chapter05/sed.xml +++ b/chapter05/sed.xml @@ -45,18 +45,19 @@ <para>Prepare Sed for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/tar.xml b/chapter05/tar.xml index b82bfde8e..566836f13 100644 --- a/chapter05/tar.xml +++ b/chapter05/tar.xml @@ -45,18 +45,19 @@ <para>Prepare Tar for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml index 04380af6a..7393709b9 100644 --- a/chapter05/tcl.xml +++ b/chapter05/tcl.xml @@ -50,15 +50,18 @@ <para>Prepare Tcl for compilation:</para> -<screen><userinput>cd unix +<screen><userinput remap="configure">cd unix ./configure --prefix=/tools</userinput></screen> <para>Build the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: <userinput>TZ=UTC make test</userinput>. - The Tcl test suite is known to experience failures under certain host + <para>To test the results, issue:</para> + +<screen><userinput remap="test">TZ=UTC make test</userinput></screen> + + <para>The Tcl test suite is known to experience failures under certain host conditions that are not fully understood. Therefore, test suite failures here are not surprising, and are not considered critical. The <parameter>TZ=UTC</parameter> parameter sets the time zone to Coordinated @@ -69,16 +72,16 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Install Tcl's headers. The next package, Expect, requires them to build.</para> -<screen><userinput>make install-private-headers</userinput></screen> +<screen><userinput remap="install">make install-private-headers</userinput></screen> <para>Now make a necessary symbolic link:</para> -<screen><userinput>ln -sv tclsh8.4 /tools/bin/tclsh</userinput></screen> +<screen><userinput remap="install">ln -sv tclsh8.4 /tools/bin/tclsh</userinput></screen> </sect2> diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml index b776ed741..cea7779e8 100644 --- a/chapter05/texinfo.xml +++ b/chapter05/texinfo.xml @@ -45,18 +45,19 @@ <para>Prepare Texinfo for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml index 3fa300b3c..d3708733f 100644 --- a/chapter05/util-linux.xml +++ b/chapter05/util-linux.xml @@ -47,27 +47,27 @@ from the <filename class="directory">/tools</filename> directory by default. This is fixed by altering the configure script:</para> -<screen><userinput>sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen> +<screen><userinput remap="pre">sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen> <para>Prepare Util-linux for compilation:</para> -<screen><userinput>./configure</userinput></screen> +<screen><userinput remap="configure">./configure</userinput></screen> <para>Compile some support routines:</para> -<screen><userinput>make -C lib</userinput></screen> +<screen><userinput remap="make">make -C lib</userinput></screen> <para>Only a few of the utilities contained in this package need to be built:</para> -<screen><userinput>make -C mount mount umount +<screen><userinput remap="make">make -C mount mount umount make -C text-utils more</userinput></screen> <para>This package does not come with a test suite.</para> <para>Copy these programs to the temporary tools directory:</para> -<screen><userinput>cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen> +<screen><userinput remap="install">cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen> </sect2> |