X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpkg%2Fperl;h=b4530e25d5a4ebc598aec28acc7efd7141982550;hb=d1040a12fae93e20587519a732730cb4c9cb5050;hp=b689a73cd546aaa519b1e3134164b12c7965e630;hpb=3605ab38ca7604b1fe43c3bce5e4963730a85d39;p=hvlinux.git

diff --git a/stage2/pkg/perl b/stage2/pkg/perl
index b689a73..b4530e2 100644
--- a/stage2/pkg/perl
+++ b/stage2/pkg/perl
@@ -2,20 +2,26 @@
 
 hvconfig_pre()
 {
-    # Change a hardcoded path from /usr/include to /tools/include:
-    sed -i 's@/usr/include@/tools/include@g' ${LFS_TMP}/${PACKAGE}/ext/Errno/Errno_pm.PL
+    # 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:
+    sed -e '/^BUILD_ZLIB/s/True/False/' \
+        -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
+        -e '/^LIB/s,\./zlib-src,/usr/lib,' \
+        -i ${LFS_TMP}/${PACKAGE}/cpan/Compress-Raw-Zlib/config.in
+
+    CONFIGURE_OPTS="\
+        --prefix=/usr \
+        -Dvendorprefix=/usr \
+        -Dman1dir=/usr/share/man/man1 \
+        -Dman3dir=/usr/share/man/man3 \
+        -Dpager='/bin/less -isR' \
+        -Dusethreads \
+        -Duseshrplib"
 }
 
 hvconfig()
 {
     cd ${LFS_TMP}/${PACKAGE}
-
-    ./configure.gnu \
-        --prefix=/tools \
-        -Dcc="gcc"
-}
-
-hvbuild_post()
-{
-    ln -svfT /tools/bin/perl /usr/bin/perl
+    ./configure.gnu ${CONFIGURE_OPTS}
 }