ソースを参照

Updated the Perl instructions, thanks to Greg Shafer for pointing out the issues - This change also required that the Zlib package is built right before the Perl package in Chapter 6

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8620 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Randy McMurchy 17 年 前
コミット
59af1dcf3a
4 ファイル変更21 行追加4 行削除
  1. 2 2
      appendices/dependencies.xml
  2. 5 0
      chapter01/changelog.xml
  3. 1 1
      chapter06/chapter06.xml
  4. 13 1
      chapter06/perl.xml

+ 2 - 2
appendices/dependencies.xml

@@ -1072,7 +1072,7 @@
 
         <seglistitem>
          <seg>Bash, Berkeley DB, Binutils, Coreutils, Gawk, GCC, Glibc, Grep,
-         Groff, Make, and Sed</seg>
+         Groff, Make, Sed, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1475,7 +1475,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>File, Module-Init-Tools, and Util-Linux</seg>
+          <seg>File, Module-Init-Tools, Perl, and Util-Linux</seg>
         </seglistitem>
       </segmentedlist>
 

+ 5 - 0
chapter01/changelog.xml

@@ -40,6 +40,11 @@
     <listitem>
       <para>2008-10-10</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated the Perl instructions. Thanks to Greg Shafer
+          for pointing out the issues. This change also required that the Zlib
+          package is built right before the Perl package in Chapter 06.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated Vim to 7.2.</para>
         </listitem>

+ 1 - 1
chapter06/chapter06.xml

@@ -35,9 +35,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bash.xml"/>

+ 13 - 1
chapter06/perl.xml

@@ -56,9 +56,21 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&perl-page-patch;</userinput></screen>
 
+    <!-- Confirmed that this is not required any longer
     <para>Fix an incompatibility with gcc-&gcc-version;:</para>
 
 <screen><userinput remap="pre">sed -i 's/command /command[ -]/' makedepend.SH</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
+    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|"         \
+    ext/Compress/Raw/Zlib/config.in</userinput></screen>
 
     <para>To have full control over the way Perl is set up, you can run the
     interactive <command>Configure</command> script and hand-pick the way this
@@ -99,7 +111,7 @@
 
     <para>To test the results (approximately 2.5 SBU), issue:</para>
 
-<screen><userinput remap="test">make -k test || true</userinput></screen>
+<screen><userinput remap="test">make test</userinput></screen>
 
     <para>Install the package:</para>