diff options
Diffstat (limited to 'chapter08')
| -rw-r--r-- | chapter08/binutils.xml | 6 | ||||
| -rw-r--r-- | chapter08/libcap.xml | 2 | ||||
| -rw-r--r-- | chapter08/libpipeline.xml | 4 | ||||
| -rw-r--r-- | chapter08/pkgmgt.xml | 4 | ||||
| -rw-r--r-- | chapter08/procps.xml | 6 |
5 files changed, 14 insertions, 8 deletions
diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index aa1ca1a3a..3930090d0 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -58,11 +58,9 @@ Ask your system administrator to create more.</computeroutput></screen> <para>Now remove one test that prevents the tests from running - to completion, and fix other tests in the gold test suite, which - need to be adjusted for GCC 10:</para> + to completion:</para> -<screen><userinput remap="pre">sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in -patch -Np1 -i ../binutils-&binutils-version;-gcc10_gold_test_fix-1.patch</userinput></screen> +<screen><userinput remap="pre">sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in</userinput></screen> <para>The Binutils documentation recommends building Binutils in a dedicated build directory:</para> diff --git a/chapter08/libcap.xml b/chapter08/libcap.xml index c2c59831c..d9ae8674f 100644 --- a/chapter08/libcap.xml +++ b/chapter08/libcap.xml @@ -45,7 +45,7 @@ <para>Prevent a static library from being installed:</para> -<screen><userinput remap="pre">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen> +<screen><userinput remap="pre">sed -i '/install -m.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen> <para>Compile the package:</para> diff --git a/chapter08/libpipeline.xml b/chapter08/libpipeline.xml index 5d275d381..9dfc2949a 100644 --- a/chapter08/libpipeline.xml +++ b/chapter08/libpipeline.xml @@ -41,6 +41,10 @@ <sect2 role="installation"> <title>Installation of Libpipeline</title> + <para>First, fix the files in the test suite:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&libpipeline-checks-patch;</userinput></screen> + <para>Prepare Libpipeline for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> diff --git a/chapter08/pkgmgt.xml b/chapter08/pkgmgt.xml index 14e94fdaf..e898416d8 100644 --- a/chapter08/pkgmgt.xml +++ b/chapter08/pkgmgt.xml @@ -38,7 +38,7 @@ </itemizedlist> <para>There are some hints written on the topic of package management. Visit - the <ulink url="&hints-index;">Hints Project</ulink> and see if one of them + the <ulink url="&hints-root;">Hints Project</ulink> and see if one of them fits your need.</para> <sect2> @@ -231,7 +231,7 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen> <title>User Based Management</title> <para>This scheme, unique to LFS, was devised by Matthias Benkmann, and is - available from the <ulink url="&hints-index;">Hints Project</ulink>. In + available from the <ulink url="&hints-root;">Hints Project</ulink>. In this scheme, each package is installed as a separate user into the standard locations. Files belonging to a package are easily identified by checking the user ID. The features and shortcomings of this approach are diff --git a/chapter08/procps.xml b/chapter08/procps.xml index b09f0f69d..90648638c 100644 --- a/chapter08/procps.xml +++ b/chapter08/procps.xml @@ -72,7 +72,7 @@ <para>Compile the package:</para> <screen><userinput remap="make">make</userinput></screen> - +<!-- <para>The test suite needs some custom modifications for LFS. Remove a test that fails when scripting does not use a tty device and fix two others. @@ -82,6 +82,10 @@ sed -i '/set tty/d' testsuite/pkill.test/pkill.exp rm testsuite/pgrep.test/pgrep.exp make check</userinput></screen> +--> + <para> To run the test suite, run:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> |