Reintroduce temporary perl at beginning of stage2

Perl is needed to build man pages for coreutils.

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 59f366d..7a6b91f 100755 (executable)
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -9,6 +9,7 @@ init_log_file
 rscr mult "Performing pre-install" pre-install
 
 ipkg -m noac -l "kernel-headers" -s "kernel-headers" ${KERNEL}
+ipkg -m acnb -j -l "${PERL}-pass1" ${PERL}
 ipkg -m noac ${MANPAGES}
 ipkg ${GLIBC}
 ipkg -m noac -s tzdata -c ${TZDATA}
@@ -55,7 +56,7 @@ ipkg ${MFOUR}
 ipkg -m noac ${PROCPS}
 ipkg ${LIBTOOL}
 ipkg ${FLEX}
-ipkg -m acnb ${PERL}
+ipkg -m acnb -l "${PERL}-pass2" ${PERL}
 ipkg -m acnb ${BISON}
 ipkg -m noac ${IPROUTE2}
 ipkg ${READLINE}

diff --git a/stage2/pkg/perl b/stage2/pkg/perl
index d1f11cf..85d79f5 100644 (file)
--- a/stage2/pkg/perl
+++ b/stage2/pkg/perl
@@ -2,22 +2,32 @@
 
 hvconfig_pre()
 {
-    # 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 ${SRC_DIR}/cpan/Compress-Raw-Zlib/config.in
+    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=/usr \
-        -Dvendorprefix=/usr \
-        -Dman1dir=/usr/share/man/man1 \
-        -Dman3dir=/usr/share/man/man3 \
-        -Dpager='/bin/less -isR' \
-        -Dusethreads \
-        -Duseshrplib"
+        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 ${SRC_DIR}/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()
@@ -25,3 +35,10 @@ hvconfig()
     cd ${SRC_DIR}
     ./configure.gnu ${CONFIGURE_OPTS}
 }
+
+hvbuild_post()
+{
+    if [ "x${HVLABEL}" = "x${PERL}-pass1" ]; then
+        ln -svfT /tools/bin/perl /usr/bin/perl
+    fi
+}