diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2014-07-27 21:49:13 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2014-07-27 21:49:13 +0000 |
| commit | 78bf0c1739a3328e64471847f6703b2be7e455c8 (patch) | |
| tree | bc2cb7b16417123f002e04d1c028c1d150bbff7e | |
| parent | b8da2a8b1ee7a1c15d25c0c45ff07e309704e809 (diff) | |
Instruct perl to use the system bzip2 library
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10658 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 3 | ||||
| -rw-r--r-- | chapter06/chapter06.xml | 2 | ||||
| -rw-r--r-- | chapter06/perl.xml | 18 |
3 files changed, 13 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 55a156a08..dbed74d8b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,9 @@ <para>2014-07-27</para> <itemizedlist> <listitem> + <para>[bdubbs] - Instruct perl to use the system bzip2 library.</para> + </listitem> + <listitem> <para>[bdubbs] - Update to check-0.9.14. Fixes <ulink url="&lfs-ticket-root;3641">#3641</ulink>.</para> </listitem> diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index d10b804a5..879cccc58 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -56,6 +56,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/> @@ -75,7 +76,6 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 645016932..170aa2388 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -47,15 +47,14 @@ <screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" > /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 <quote>-des</quote> options from the following command and hand-pick the way @@ -115,9 +114,10 @@ <screen><userinput remap="test">make -k test</userinput></screen> - <para>Install the package:</para> + <para>Install the package and clean up:</para> -<screen><userinput remap="install">make install</userinput></screen> +<screen><userinput remap="install">make install +unset BUILD_ZLIB BUILD_BZIP2</userinput></screen> </sect2> |