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

diff --git a/stage2/pkg/perl b/stage2/pkg/perl
index b689a73..69cf777 100644
--- a/stage2/pkg/perl
+++ b/stage2/pkg/perl
@@ -2,20 +2,43 @@
 
 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
+    if [ "x${HVLABEL}" = "x${PERL}-pass1" ]; then
+        # Change a hardcoded path from /usr/include to /tools/include:
+        sed 's@/usr/include@/tools/include@g' \
+            -i ${LFS_TMP}/${PACKAGE}/ext/Errno/Errno_pm.PL
+
+        CONFIGURE_OPTS="\
+            --prefix=/tools \
+            -Dcc=gcc"
+    else
+        # 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"
+    fi
 }
 
 hvconfig()
 {
     cd ${LFS_TMP}/${PACKAGE}
-
-    ./configure.gnu \
-        --prefix=/tools \
-        -Dcc="gcc"
+    ./configure.gnu ${CONFIGURE_OPTS}
 }
 
 hvbuild_post()
 {
-    ln -svfT /tools/bin/perl /usr/bin/perl
+    if [ "x${HVLABEL}" = "x${PERL}-pass1" ]; then
+        ln -svfT /tools/bin/perl /usr/bin/perl
+    fi
 }