Changeset 49a9e0e9 for chapter06

Timestamp:

07/27/2014 11:18:50 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

658b611

Parents:

e2fbdae

Message:

Merge lfs svn.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10660 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• e2fsprogs.xml (modified) (2 diffs)
• perl.xml (modified) (2 diffs)
• tar.xml (modified) (2 diffs)

chapter06/e2fsprogs.xml

@@ -44 +44 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
-
-    <para>First fix a problem with running regression tests in the LFS chroot
-    environment:</para>
-
-<screen><userinput remap="pre">sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
 
     <para>The E2fsprogs documentation recommends that the package be built in
@@ -122 +117 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To set up the test suite we need to temporarily copy
-    a library from /tools/lib so the test programs can find it. 
+    <para>To set up and run the test suite we need to first link some 
+    libraries from /tools/lib to a location where the test programs look.
     To run the tests, issue:</para>
 
-<screen><userinput remap="test">cp -v /tools/lib/libblkid.so.1 /lib
-make check
-rm -v /lib/libblkid.so.1</userinput></screen>
+<screen><userinput remap="test">ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib
+make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
 
     <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory.

chapter06/perl.xml

@@ -48 +48 @@
 <screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
-    <para>This version of Perl now builds the Compress::Raw::Zlib module. By
-    default Perl will use an internal copy of the Zlib source for the build.
-    Issue the following command so that Perl will use the Zlib library
+    <para>This version of Perl now builds the Compress::Raw::Zlib ane 
+    Compress::Raw::BZip2 modules. By
+    default Perl will use an internal copy of the sources for the build.
+    Issue the following command so that Perl will use the libraries
     installed on the system:</para>
 
-<screen><userinput remap="pre">sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|"           \
-       -e "s|INCLUDE\s*= ./zlib-src|INCLUDE    = /usr/include|" \
-       -e "s|LIB\s*= ./zlib-src|LIB        = /usr/lib|"         \
-    cpan/Compress-Raw-Zlib/config.in</userinput></screen>
+<screen><userinput remap="pre">export BUILD_ZLIB=False
+export BUILD_BZIP2=0</userinput></screen>
 
     <para>To have full control over the way Perl is set up, you can remove the
@@ -116 +115 @@
 <screen><userinput remap="test">make -k test</userinput></screen>
 
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
+    <para>Install the package and clean up:</para>
+
+<screen><userinput remap="install">make install
+unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
 
   </sect2>

chapter06/tar.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
-
+<!--
     <para>Add a program that generates a man page for tar from the source code:</para>
  
  <screen><userinput remap="pre">patch -Np1 -i ../&tar-manpage-patch;</userinput></screen>
-
+-->
     <para>Prepare Tar for compilation:</para>
 
@@ -77 +77 @@
 <screen><userinput remap="install">make install
 make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
-
+<!--
     <para>Finally, generate the man page and place it in the proper location:</para>
 
 <screen><userinput remap="install">perl tarman &gt; /usr/share/man/man1/tar.1</userinput></screen>
-
+-->
   </sect2>