Jelajahi Sumber

Incorporate perl fixes from 2012-06-03 in the perl patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9876 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs 13 tahun lalu
induk
melakukan
676c3160c0
3 mengubah file dengan 8 tambahan dan 10 penghapusan
  1. 4 0
      chapter01/changelog.xml
  2. 1 7
      chapter05/perl.xml
  3. 3 3
      patches.ent

+ 4 - 0
chapter01/changelog.xml

@@ -39,6 +39,10 @@
     <listitem>
       <para>2012-06-04</para>
       <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Incorporate perl fixes from 2012-06-03
+           in the perl patch.</para>
+         </listitem>
          <listitem>
            <para>[matthew] - Upgrade to Psmisc-22.17. Fixes
            <ulink url="&lfs-ticket-root;3109">#3109</ulink>.</para>

+ 1 - 7
chapter05/perl.xml

@@ -48,19 +48,13 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
 
-    <para>The configuration script needs to be adjusted to run in the restricted
-    LFS environment:</para>
-
-<screen><userinput remap="pre">chmod -v 0775 Configure
-sed -i -e '/Restore computed paths/i libswanted=""' Configure</userinput></screen>
-
     <para>Prepare Perl for compilation:</para>
 
 <screen><userinput remap="configure">sh Configure -des -Dprefix=/tools</userinput></screen>
 
     <para>Build the package:</para>
 
-<screen><userinput remap="make">make CLDFLAGS='-lm'</userinput></screen>
+<screen><userinput remap="make">make</userinput></screen>
 
     <para>Although Perl comes with a test suite, it would be better to wait
     until it is insalled in the next chapter.</para>

+ 3 - 3
patches.ent

@@ -75,9 +75,9 @@
 <!ENTITY patch-test-patch-size "1 KB">
 
 
-<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
-<!ENTITY perl-libc-patch-md5 "23682f20b6785e97f99d33be7719c9d6">
-<!ENTITY perl-libc-patch-size "1 KB">
+<!ENTITY perl-libc-patch "perl-&perl-version;-libc-2.patch">
+<!ENTITY perl-libc-patch-md5 "daf5c64fd7311e924966842680535f8f">
+<!ENTITY perl-libc-patch-size "1.6 KB">
 
 
 <!ENTITY procps-hz_fixes-patch "procps-&procps-version;-fix_HZ_errors-1.patch">