Remove temporary installation of Perl at beginning of stage2

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 9885337..ef23798 100755 (executable)
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -8,7 +8,6 @@ init_log_file
 
 rscr mult "Performing pre-install" pre-install
 
-ipkg -j -l "${PERL}-pass1" ${PERL}
 ipkg -m noac -l "kernel-headers" -s "kernel-headers" ${KERNEL}
 ipkg -m noac ${MANPAGES}
 ipkg ${EGLIBC}
@@ -51,12 +50,12 @@ ipkg -m noac ${GPTFDISK}
 FORCE_UNSAFE_CONFIGURE=1 ipkg  -m acnb ${COREUTILS}
 ipkg -m noac ${IANA}
 ipkg ${MFOUR}
-ipkg ${BISON}
 ipkg -m noac ${PROCPS}
 ipkg ${LIBTOOL}
 ipkg ${FLEX}
+ipkg ${PERL}
+ipkg ${BISON}
 ipkg -m noac ${IPROUTE2}
-ipkg -l "${PERL}-pass2" ${PERL}
 ipkg ${READLINE}
 ipkg ${AUTOCONF}
 ipkg ${AUTOMAKE}

diff --git a/stage2/patches/common/eglibc-2.15-r17386-no-perl.patch b/stage2/patches/common/eglibc-2.15-r17386-no-perl.patch
new file mode 100644 (file)
index 0000000..2eb5414
--- /dev/null
+++ b/stage2/patches/common/eglibc-2.15-r17386-no-perl.patch
@@ -0,0 +1,24 @@
+If we're using a cvs snapshot which updates the source files, and
+perl isn't installed yet, then we can't regen the docs.  Not a big
+deal, so just whine a little and continue on our merry way.
+
+http://bugs.gentoo.org/60132
+
+diff -durN glibc-2.12.1.orig/manual/Makefile glibc-2.12.1/manual/Makefile
+--- glibc-2.12.1.orig/manual/Makefile  2006-01-08 07:43:47.000000000 +0100
++++ glibc-2.12.1/manual/Makefile       2009-11-13 00:49:54.000000000 +0100
+@@ -104,9 +104,14 @@
+ libm-err.texi: stamp-libm-err
+ stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
+                                                    $(dir)/libm-test-ulps))
++ifneq ($(PERL),no)
+       pwd=`pwd`; \
+       $(PERL) $< $$pwd/.. > libm-err-tmp
+       $(move-if-change) libm-err-tmp libm-err.texi
++else
++      echo "Unable to rebuild math docs, no perl installed"
++      touch libm-err.texi
++endif
+       touch $@
+ 
+ # Generate Texinfo files from the C source for the example programs.

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