aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter05/perl.xml8
-rw-r--r--patches.ent6
3 files changed, 8 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8c552f6f0..209f7bb9c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
<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>
</listitem>
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index dc279539a..f59a2f7f8 100644
--- a/chapter05/perl.xml
+++ b/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>
diff --git a/patches.ent b/patches.ent
index 4fa0fab57..78d8f8ff4 100644
--- a/patches.ent
+++ b/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">