Remove temporary installation of Perl at beginning of stage2

[hvlinux.git] / stage2 / pkg / eglibc

diff --git a/stage2/pkg/eglibc b/stage2/pkg/eglibc
index 6173260..0d07767 100644 (file)
--- a/stage2/pkg/eglibc
+++ b/stage2/pkg/eglibc
@@ -2,22 +2,28 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --disable-profile \
         --enable-add-ons \
         --enable-kernel=$(get_pkg_ver ${KERNEL}) \
         --libexecdir=/usr/lib/eglibc"
 
+    cd ${LFS_TMP}/${PACKAGE}
+
+    # At the end of the installation, the build system will run a sanity test to
+    # make sure everything installed properly. This script will attempt to test
+    # for a library that is only used in the test suite and is never installed.
+    # Prevent the script from testing for this library with the following command:
+    sed -i 's/\(&& $name ne\) "db1"/ & \1 "nss_test1"/' scripts/test-installation.pl
+
     # When running make install, a script called test-installation.pl performs a
     # small sanity test on our newly installed Glibc. However, because our
     # toolchain still points to the /tools directory, the sanity test would be
     # carried out against the wrong Glibc. We can force the script to check the
     # Glibc we have just installed with:
-    cd ${LFS_TMP}/${PACKAGE}
     LINKER=$(readelf -l $(file /tools/lib/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
     sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
-        scripts/test-installation.pl
+               scripts/test-installation.pl
     unset LINKER
 
     cd ${LFS_TMP}/${PACKAGE}-build
@@ -26,7 +32,7 @@ hvconfig_pre()
         "x86_64")
             # Tell EGLIBC to install its libraries into /lib:
             echo "slibdir=/lib" >> configparms
-            CONFIGURE_OPTS="${CONFIGURE_OPTS} --libdir=/usr/lib"
+            CONFIGURE_OPTS+=" --libdir=/usr/lib"
            ;;
     esac
 }