Changeset 9cc06db for BOOK

Timestamp:

Aug 2, 2014, 5:50:53 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

c9f9769

Parents:

147a241

git-author:

Chris Staub <chris@…> (08/02/14 05:50:25)

git-committer:

Chris Staub <chris@…> (08/02/14 05:50:53)

Message:

Make Perl use system-installed bzip2 as well

Location:

BOOK

Files:

• appendices/dependencies/common.xml (modified) (1 diff)
• final-system/common/perl.xml (modified) (2 diffs)
• final-system/mips-chapter.xml (modified) (2 diffs)
• final-system/mips64-64-chapter.xml (modified) (2 diffs)
• final-system/mips64-chapter.xml (modified) (2 diffs)
• final-system/ppc-chapter.xml (modified) (2 diffs)
• final-system/ppc64-64-chapter.xml (modified) (2 diffs)
• final-system/ppc64-chapter.xml (modified) (2 diffs)
• final-system/sparc-chapter.xml (modified) (2 diffs)
• final-system/sparc64-64-chapter.xml (modified) (2 diffs)
• final-system/sparc64-chapter.xml (modified) (2 diffs)
• final-system/x86-chapter.xml (modified) (2 diffs)
• final-system/x86_64-64-chapter.xml (modified) (2 diffs)
• final-system/x86_64-chapter.xml (modified) (2 diffs)
• introduction/common/changelog.xml (modified) (1 diff)

BOOK/appendices/dependencies/common.xml

@@ -1484 +1484 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Bzip2, Coreutils, Glibc, Gawk, GCC, Grep,
          Make, Sed</seg>
         </seglistitem>

BOOK/final-system/common/perl.xml

@@ -26 +26 @@
     <title>Installation of Perl</title>
 
-    <para os="s3">By default, Perl's Compress::Raw::Zlib module builds and
-    links against its own internal copy of Zlib. The following command will
-    tell it to use the system-installed Zlib:</para>
-
-<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/s/True/False/' \
-       -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
-       -e '/^LIB/s,\./zlib-src,/usr/lib,' \
-       cpan/Compress-Raw-Zlib/config.in</userinput></screen>
+    <para os="s3">By default, Perl's Compress::Raw::Zlib and
+    Compress::Raw::Bzip2 modules build and link against internal copies of
+    Zlib and Bzip2. The following command will make Perl use the
+    system-installed copies of these libraries:</para>
+
+<screen os="s4"><userinput>export BUILD_ZLIB=False
+export BUILD_BZIP2=0</userinput></screen>
 
     <note os="a00">
@@ -106 +105 @@
 <screen os="h2"><userinput remap="test">make test</userinput></screen>
 
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make install</userinput></screen>
+    <para os="j">Install the package and remove the variables set previously:</para>
+
+<screen os="k"><userinput>make install
+unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
 
   </sect2>

BOOK/final-system/mips-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>

BOOK/final-system/mips64-64-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>

BOOK/final-system/mips64-chapter.xml

@@ -71 +71 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-n32.xml"/>
@@ -84 +87 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>

BOOK/final-system/ppc-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>

BOOK/final-system/ppc64-64-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>

BOOK/final-system/ppc64-chapter.xml

@@ -57 +57 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
@@ -67 +69 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>

BOOK/final-system/sparc-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>

BOOK/final-system/sparc64-64-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>

BOOK/final-system/sparc64-chapter.xml

@@ -57 +57 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
@@ -67 +69 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>

BOOK/final-system/x86-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>

BOOK/final-system/x86_64-64-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>

BOOK/final-system/x86_64-chapter.xml

@@ -57 +57 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
@@ -67 +69 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>

BOOK/introduction/common/changelog.xml

@@ -47 +47 @@
           system, so that Ncurses will install .pc files.</para>
         </listitem>
+        <listitem>
+          <para>[Chris] - Move Bzip2 before Perl and modify Perl instructions
+          to use system-install Bzip2. Solution borrowed from LFS.</para>
+        </listitem>
       </itemizedlist>
     </listitem>