From 67906555169af493bc63114cfd1a38667dda09f5 Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Mon, 20 Dec 2004 16:38:42 +0000 Subject: Removed text in chapter 05 - first round. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4431 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/adjusting.xml | 81 ++------------------------------------ chapter05/bash.xml | 19 ++------- chapter05/binutils-pass1.xml | 93 ++------------------------------------------ chapter05/binutils-pass2.xml | 35 ----------------- chapter05/bison.xml | 7 ---- chapter05/bzip2.xml | 7 ---- chapter05/coreutils.xml | 29 +------------- chapter05/dejagnu.xml | 24 +----------- chapter05/diffutils.xml | 7 ---- chapter05/expect.xml | 75 ++--------------------------------- chapter05/findutils.xml | 11 +----- chapter05/flex.xml | 14 ------- chapter05/gawk.xml | 11 +----- 13 files changed, 20 insertions(+), 393 deletions(-) (limited to 'chapter05') diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml index f2a76ebe0..6d3aca31f 100644 --- a/chapter05/adjusting.xml +++ b/chapter05/adjusting.xml @@ -7,37 +7,12 @@ Adjusting the toolchain -Now that the temporary C libraries have been installed, all -the tools compiled in the rest of this chapter should be linked against these -libraries. In order to accomplish this, the linker and the compiler's -specs file, need to be adjsted. - - Some people would say that there is black magic juju -below this line, but it is really very simple. - -First, the linker, adjusted at the end of the first pass of Binutils, is -installed by running the following command from within +Run the following command from within the binutils-build directory: make -C ld install -From this point onwards everything will link only -against the libraries in /tools/lib. - -If you missed the earlier warning to retain the Binutils -source and build directories from the first pass, dont worry - all is not lost. -Just ignore the above command. This results in a small chance of the subsequent -testing programs linking against libraries on the host. This is not ideal, but -it's not a major problem. The situation is corrected when the second pass of -Binutils is installed later on. - -Now that the adjusted linker is installed, the Binutils build and source -directories should be removed. - -The next task is to amend our GCC specs file so that it points -to the new dynamic linker. A simple sed script will accomplish this: - - +Amend the GCC specs file: SPECFILE=`gcc --print-file specs` && sed 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \ @@ -45,65 +20,17 @@ sed 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \ mv -f tempspecfile $SPECFILE && unset SPECFILE -It is recommended that the above command be cut-and-pasted in order to -ensure correctness - Alternatively, the specs file can be edited by hand. This -is done simply by replacing every occurrence of -/lib/ld-linux.so.2 with /tools/lib/ld-linux.so.2. - - - Be sure to visually inspect the specs file in order to verify the intended changes have been made. - -If you are working on a platform where the name of the dynamic -linker is something other than ld-linux.so.2, you -must replace ld-linux.so.2 with the -name of your platform's dynamic linker in the above commands. Refer back to - if necessary. - -Lastly, there is a possibility that some include files from the host -system have found their way into GCC's private include dir. This can happen -as a result of of GCC's fixincludes process which runs as part -of the GCC build. We'll explain more about this further on in this chapter. -Run the following commands to eliminate this possibility: - rm -f /tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h} - -It is imperative at this point to stop and ensure that the basic -functions (compiling and linking) of the new toolchain are working as expected. -To perform a simple sanity check, run the following commands: - echo 'main(){}' > dummy.c cc dummy.c readelf -l a.out | grep ': /tools' -If everything is working correctly, there should be no errors, and the -output of the last command will be of the form: - -
[Requesting program interpreter: /tools/lib/ld-linux.so.2]
- -Note especially that /tools/lib -appears as the prefix of our dynamic linker. - -If the output is not -as shown above, or there was no output at all, then something is seriously -wrong. You will need to investigate and retrace your steps to find out where the -problem is and correct it. There is no point in continuing until this is done. -First, perform the sanity check again, using gcc instead of -cc. If this works, then the -/tools/bin/cc symlink is missing. Revisit - and install the symlink. Second, ensure your PATH -is correct. You can check this by running echo $PATH and -verifying that /tools/bin is at the head -of the list. If the PATH is wrong it could mean you're not logged in as user -lfs or something went wrong back in -. Third, something may have gone wrong with -the specs file amendment above. In this case redo the specs file amendment -being careful to cut-and-paste the commands. +The output of the last command will be of the form: -Once you are satisfied that all is well, clean up the test files: +[Requesting program interpreter: /tools/lib/ld-linux.so.2] rm dummy.c a.out - diff --git a/chapter05/bash.xml b/chapter05/bash.xml index 7b741aef9..962aef84a 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -12,7 +12,6 @@ tools -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -20,16 +19,11 @@ <seglistitem><seg>1.2 SBU</seg><seg>27 MB</seg></seglistitem> </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> - </sect2> <sect2 role="installation"> <title>Installation of Bash -Bash has a problem when compiled against newer versions of glibc, causing -it to hang inappropriately. This patch fixes the problem: - patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch Prepare Bash for compilation: @@ -40,22 +34,15 @@ it to hang inappropriately. This patch fixes the problem: make -(If you want to test the results, then issue: -make tests.) +To test the results, issue: +make test. -Then install it and its documentation: +Then install it : make install -And make a link for the programs that use sh -for a shell: - ln -s bash /tools/bin/sh - -<para>The details on this package are found in <xref linkend="contents-bash"/>.</para> -</sect2> - </sect1> diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index 8b693e3b9..0174fc86e 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -12,7 +12,6 @@ <secondary>tools, pass 1</secondary></indexterm> <sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/binutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -20,93 +19,34 @@ <seglistitem><seg>1.0 SBU</seg><seg>194 MB</seg></seglistitem> </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/binutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> - </sect2> <sect2 role="installation"> <title>Installation of Binutils -It is important that Binutils be the first package to get compiled, -because both Glibc and GCC perform various tests on the available linker and -assembler to determine which of their own features to enable. - -This package is known to behave badly when you change its default -optimization flags (including the -march and --mcpu options). Therefore, if you have defined any -environment variables that override default optimizations, such as CFLAGS and -CXXFLAGS, we recommend un-setting them when building Binutils. - The current version of Binutils in use has a bug that causes strip to remove necessary information from certain library files. This patch fixes the problem: patch -Np1 -i ../binutils-&binutils-version;-fix_strip-1.patch -The Binutils documentation recommends building Binutils outside of the -source directory in a dedicated build directory: - mkdir ../binutils-build cd ../binutils-build -If you want the SBU values listed in the rest of the book to be of -any use, you will have to measure the time it takes to build this package -- -from the configuration up to and including the first install. To achieve this -easily, you could wrap the four commands in a time command -like this: time { ./configure ... && ... && ... +If you want the SBU values you could wrap the four commands in a +time command like this: +time { ./configure ... && ... && ... && make install; }. Now prepare Binutils for compilation: ../binutils-&binutils-version;/configure --prefix=/tools --disable-nls -The meaning of the configure options: - - - ---prefix=/tools -This tells the configure script to prepare to install the Binutils -programs in the /tools directory. - - - ---disable-nls -This disables internationalization (a word often shortened to -i18n). We don't need this for our static programs and nls -often causes problems when linking statically. - - - Continue with compiling the package: make configure-host make LDFLAGS="-all-static" -The meaning of the make parameters: - - - -configure-host -This forces all the subdirectories to be configured immediately. -A statically linked build will fail without it. We therefore use this option to work -around the problem. - - - -LDFLAGS="-all-static" -This tells the linker that all the Binutils programs should be -linked statically. However, strictly speaking, "-all-static" -is passed to the libtool program, which then passes -"-static" to the linker. - - - -Compilation is complete. Normally we would now run the test suite, but -at this early stage the test suite framework (Tcl, Expect and DejaGNU) is not -yet in place. And there would be little point in running the tests anyhow, -since the programs from this first pass will soon be replaced by those from the -second. - Now install the package: make install @@ -116,37 +56,10 @@ second. make -C ld clean make -C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib -The meaning of the make parameters: - - - --C ld clean -This tells the make program to remove all the compiled files -in the ld subdirectory. - - - --C ld LDFLAGS="-all-static" -LIB_PATH=/tools/lib -This option rebuilds everything in the -ld subdirectory. Specifying the LIB_PATH -makefile variable on the command line allows us to override the default value -and have it point to our temporary tools location. The value of this variable -specifies the linker's default library search path. You will see how this -preparation is used later on in the chapter. - - - - Do not yet remove the Binutils build and source directories. You will need them again in their current state a bit further on in this chapter. - - - - -<para>The details on this package are found in <xref linkend="contents-binutils"/>.</para> </sect2> </sect1> diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index 0a1799235..7491346ed 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -40,29 +40,10 @@ cd ../binutils-build</userinput></screen> <screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \ --enable-shared --with-lib-path=/tools/lib</userinput></screen> -<para>The meaning of the new configure option:</para> - -<variablelist> -<varlistentry> -<term><parameter>--with-lib-path=/tools/lib</parameter></term> -<listitem><para>This tells the configure script to specify the library search path -during the compilation of Binutils, resulting in <parameter>/tools/lib</parameter> -to be passed to the linker. This prevents the linker from searching through library -directories on the host.</para></listitem> -</varlistentry> -</variablelist> - -<para>Before starting to build Binutils, remember to unset any environment -variables that override the default optimization flags.</para> - <para>Compile the package:</para> <screen><userinput>make</userinput></screen> -<para>Compilation is now complete. As discussed earlier, running the test suite -isn't mandatory for the temporary tools here in this chapter. If you do want to -run the Binutils test suite though, the following command will do so:</para> - <screen><userinput>make -k check</userinput></screen> <para>Except for a few known failures, the binutils tests should all pass. The @@ -72,17 +53,6 @@ exceptions to this rule are as follows:</para> * 1 FAIL for selective4 * 1 FAIL for selective5</computeroutput></screen> -<!-- - -<para>There should be no unexpected failures here, expected failures are fine. -Unfortunately, there is no easy way to view the test results summary like there -was for the GCC package. However, if a failure occurs here, it should be easy -to spot. The output shown will contain something like:</para> - -<blockquote><screen><computeroutput>make[1]: *** [check-binutils] Error 2</computeroutput></screen></blockquote> - ---> - <para>And install the package:</para> <screen><userinput>make install</userinput></screen> @@ -98,11 +68,6 @@ make -C ld LIB_PATH=/usr/lib:/lib</userinput></screen> build directories. You will need these directories again in the next chapter in the state they are in now.</para></warning> - -</sect2> - -<sect2 role="content"><title/> -<para>The details on this package are found in <xref linkend="contents-binutils"/>.</para> </sect2> </sect1> diff --git a/chapter05/bison.xml b/chapter05/bison.xml index 3be3c4020..c7fd2c168 100644 --- a/chapter05/bison.xml +++ b/chapter05/bison.xml @@ -12,7 +12,6 @@ <secondary>tools</secondary></indexterm> <sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bison.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -20,8 +19,6 @@ <seglistitem><seg>0.6 SBU</seg><seg>10.6 MB</seg></seglistitem> </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bison.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> - </sect2> <sect2 role="installation"> @@ -44,8 +41,4 @@ </sect2> -<sect2 role="content"><title/> -<para>The details on this package are found in <xref linkend="contents-bison"/>.</para> -</sect2> - </sect1> diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml index ece8fc2bf..024471388 100644 --- a/chapter05/bzip2.xml +++ b/chapter05/bzip2.xml @@ -12,7 +12,6 @@ <secondary>tools</secondary></indexterm> <sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bzip2.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -20,8 +19,6 @@ <seglistitem><seg>0.1 SBU</seg><seg>2.5 MB</seg></seglistitem> </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bzip2.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> - </sect2> <sect2 role="installation"> @@ -38,8 +35,4 @@ script. Compile it with a straightforward:</para> </sect2> -<sect2 role="content"><title/> -<para>The details on this package are found in <xref linkend="contents-bzip2"/>.</para> -</sect2> - </sect1> diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml index 27eea305f..836124841 100644 --- a/chapter05/coreutils.xml +++ b/chapter05/coreutils.xml @@ -12,7 +12,6 @@ <secondary>tools</secondary></indexterm> <sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -20,8 +19,6 @@ <seglistitem><seg>0.9 SBU</seg><seg>69 MB</seg></seglistitem> </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> - </sect2> <sect2 role="installation"> @@ -31,30 +28,12 @@ <screen><userinput>DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=/tools</userinput></screen> -<para>This package has an issue when compiled against versions of Glibc -later than 2.3.2. Some of the Coreutils utilities (such as -<command>head</command>, <command>tail</command> and <command>sort</command>) -will reject their traditional syntax, a syntax that has been in use for -approximately 30 years. This old syntax is so pervasive that compatibility -should be preserved until the many places where it is used can be -updated. Backwards compatibility is achieved by setting the -DEFAULT_POSIX2_VERSION environment variable to <quote>199209</quote> in the above -command. If you don't want coreutils to be backwards compatible -with the traditional syntax, then simply omit setting the DEFAULT_POSIX2_VERSION -environment variable. Realise though, that doing so will mean you'll have -to deal with the consequences yourself: patch the many packages that still use -the old syntax. We therefore recommend using the instructions exactly as given -above.</para> - <para>Compile the package:</para> <screen><userinput>make</userinput></screen> -<para>(If you want to test the results, then issue: -<userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput>. The -<parameter>RUN_EXPENSIVE_TESTS=yes</parameter> parameter tells the test suite to -run several additional tests that are considered relatively expensive on some -platforms but generally are not a problem on Linux.)</para> +<para>To test the result, issue: +<userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput></para> <para>And install the package:</para> @@ -62,8 +41,4 @@ platforms but generally are not a problem on Linux.)</para> </sect2> -<sect2 role="content"><title/> -<para>The details on this package are found in <xref linkend="contents-coreutils"/>.</para> -</sect2> - </sect1> diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml index f9de3faf0..f9b589e10 100644 --- a/chapter05/dejagnu.xml +++ b/chapter05/dejagnu.xml @@ -10,7 +10,6 @@ <indexterm zone="ch-tools-dejagnu"><primary sortas="a-DejaGNU">DejaGNU</primary></indexterm> <sect2 role="package"><title/> -<para>The DejaGNU package contains a framework for testing other programs.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -18,11 +17,6 @@ <seglistitem><seg>0.1 SBU</seg><seg>8.6 MB</seg></seglistitem> </segmentedlist> -<segmentedlist> -<segtitle>DejaGNU installation depends on</segtitle> -<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, -GCC, Glibc, Grep, Make, Sed</seg></seglistitem> -</segmentedlist> </sect2> <sect2 role="installation"> @@ -38,25 +32,9 @@ GCC, Glibc, Grep, Make, Sed</seg></seglistitem> </sect2> - <sect2 id="contents-dejagnu" role="content"><title>Contents of DejaGNU - -Installed program -runtest - - -Short description - - -runtest - -runtest -is the wrapper script that finds the proper -expect shell and then runs DejaGNU. - - - +See testing diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml index 3fc78f0ee..86edbb0ca 100644 --- a/chapter05/diffutils.xml +++ b/chapter05/diffutils.xml @@ -12,7 +12,6 @@ tools -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -20,8 +19,6 @@ <seglistitem><seg>0.1 SBU</seg><seg>7.5 MB</seg></seglistitem> </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> - </sect2> <sect2 role="installation"> @@ -41,8 +38,4 @@ </sect2> -<sect2 role="content"><title/> -<para>The details on this package are found in <xref linkend="contents-diffutils"/>.</para> -</sect2> - </sect1> diff --git a/chapter05/expect.xml b/chapter05/expect.xml index 28533b4af..6ac5cdef0 100644 --- a/chapter05/expect.xml +++ b/chapter05/expect.xml @@ -10,8 +10,6 @@ <indexterm zone="ch-tools-expect"><primary sortas="a-Expect">Expect</primary></indexterm> <sect2 role="package"><title/> -<para>The Expect package contains a program for carrying out scripted dialogues -with other interactive programs.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -19,102 +17,35 @@ with other interactive programs.</para> <seglistitem><seg>0.1 SBU</seg><seg>3.9 MB</seg></seglistitem> </segmentedlist> -<segmentedlist> -<segtitle>Expect installation depends on</segtitle> -<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, -GCC, Glibc, Grep, Make, Sed, Tcl</seg></seglistitem> -</segmentedlist> </sect2> <sect2 role="installation"> <title>Installation of Expect -First fix a bug that can result in bogus failures during the GCC test -suite run: - patch -Np1 -i ../expect-&expect-version;-spawn-1.patch Now prepare Expect for compilation: ./configure --prefix=/tools --with-tcl=/tools/lib --with-x=no -The meaning of the configure options: - - - ---with-tcl=/tools/lib -This ensures that -the configure script finds the Tcl installation in our temporary tools location. -We don't want it to find an existing one that may possibly reside on the host -system. - - - ---with-x=no -This tells the configure -script not to search for Tk (the Tcl GUI component) or the X Window System -libraries, both of which may possibly reside on the host system. - - - Build the package: make -(If you want to test the results, then issue: -make test. However, 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.) +To test the results, issue: +make test And install it: make SCRIPTS="" install -The meaning of the make parameter: - - - -SCRIPTS="" -This prevents installation -of the supplementary expect scripts which are not needed. - - - You can now remove the source directories of both Tcl and Expect. - Contents of Expect - -Installed program -Installed library -expectlibexpect-5.42.a - - -Short description - - -expect - -expect -talks to other interactive -programs according to a script. - - - - -libexpect-5.42.a - -contains functions that allow Expect to be used as a Tcl extension or to -be used directly from C or C++ (without Tcl)." -libexpect-5.42 - - - +See testing diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml index aa204ccf5..21ba323ef 100644 --- a/chapter05/findutils.xml +++ b/chapter05/findutils.xml @@ -12,7 +12,6 @@ tools -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -20,8 +19,6 @@ <seglistitem><seg>0.2 SBU</seg><seg>7.6 MB</seg></seglistitem> </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> - </sect2> <sect2 role="installation"> @@ -35,8 +32,8 @@ <screen><userinput>make</userinput></screen> -<para>(If you want to test the results, then issue: -<userinput>make check</userinput>.)</para> +<para>To test the results, issue: +<userinput>make check</userinput></para> <para>And install the package:</para> @@ -44,8 +41,4 @@ </sect2> -<sect2 role="content"><title/> -<para>The details on this package are found in <xref linkend="contents-findutils"/>.</para> -</sect2> - </sect1> diff --git a/chapter05/flex.xml b/chapter05/flex.xml index b1c6b3525..11e81cd51 100644 --- a/chapter05/flex.xml +++ b/chapter05/flex.xml @@ -12,7 +12,6 @@ <secondary>tools</secondary></indexterm> <sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -20,22 +19,13 @@ <seglistitem><seg>0.6 SBU</seg><seg>10.6 MB</seg></seglistitem> </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> - </sect2> <sect2 role="installation"> <title>Installation of Flex -Flex contains several known bugs. Fix these with the following patch: - patch -Np1 -i ../flex-&flex-version;-debian_fixes-2.patch -The GNU autotools detects that the Flex source code has been modified by -the previous patch, and tries to update the manual page accordingly, but this -breaks on many systems, and the default page is fine, so make sure it doesn't -get regenerated: - touch doc/flex.1 Now prepare Flex for compilation: @@ -55,8 +45,4 @@ get regenerated: - -<para>The details on this package are found in <xref linkend="contents-flex"/>.</para> -</sect2> - </sect1> diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml index 356cf2339..c43aba03b 100644 --- a/chapter05/gawk.xml +++ b/chapter05/gawk.xml @@ -12,7 +12,6 @@ <secondary>tools</secondary></indexterm> <sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -20,8 +19,6 @@ <seglistitem><seg>0.2 SBU</seg><seg>17 MB</seg></seglistitem> </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> - </sect2> <sect2 role="installation"> @@ -35,8 +32,8 @@ <screen><userinput>make</userinput></screen> -<para>(If you want to test the results, then issue: -<userinput>make check</userinput>.)</para> +<para>To test the results, issue: +<userinput>make check</userinput></para> <para>And install it:</para> @@ -44,8 +41,4 @@ </sect2> -<sect2 role="content"><title/> -<para>The details on this package are found in <xref linkend="contents-gawk"/>.</para> -</sect2> - </sect1> -- cgit v1.2.3-54-g00ecf