Completed transition to new ipkg method (ipkg.def), successfully booting after stage 1

[hvlinux.git] / stage0 / pkg / eglibc

diff --git a/stage0/pkg/eglibc b/stage0/pkg/eglibc
index fe9dfe2..268e0b9 100644 (file)
--- a/stage0/pkg/eglibc
+++ b/stage0/pkg/eglibc
@@ -1,35 +1,24 @@
 #!/bin/bash
 
-BUILD_CC="gcc"
-CC="${CLFS_TARGET}-gcc ${CLFS_BUILDFLAGS}"
-AR="${CLFS_TARGET}-ar"
-RANLIB="${CLFS_TARGET}-ranlib"
-
-CONFIGURE_OPTS="\
-    --prefix=/tools \
-    --host=${CLFS_TARGET} \
-    --build=${CLFS_HOST} \
-    --disable-profile \
-    --enable-add-ons \
-    --with-tls \
-    --enable-kernel=$(get_pkg_ver ${KERNEL}) \
-    --with-__thread \
-    --with-binutils=/cross-tools/bin \
-    --with-headers=/tools/include"
-
-# For Glibc to support NPTL:
-hvconfig_cache()
-{
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
-libc_cv_forced_unwind=yes
-libc_cv_c_cleanup=yes
-libc_cv_gnu89_inline=yes
-libc_cv_ssp=no
-EOF
-}
-
 hvconfig_pre()
 {
+    export BUILD_CC="gcc"
+    export CC="${CLFS_TARGET}-gcc ${CLFS_BUILDFLAGS}"
+    export AR="${CLFS_TARGET}-ar"
+    export RANLIB="${CLFS_TARGET}-ranlib"
+
+    CONFIGURE_OPTS="\
+        --prefix=/tools \
+        --host=${CLFS_TARGET} \
+        --build=${CLFS_HOST} \
+        --disable-profile \
+        --enable-add-ons \
+        --with-tls \
+        --enable-kernel=$(get_pkg_ver ${KERNEL}) \
+        --with-__thread \
+        --with-binutils=/cross-tools/bin \
+        --with-headers=/tools/include"
+
     case "${HVL_TARGET}" in
         "x86")
             CFLAGS="-march=$(cut -d- -f1 <<< ${CLFS_TARGET}) -mtune=native -g -O2"
@@ -46,3 +35,23 @@ hvconfig_pre()
     # Disable linking to libgcc_eh:
     sed -e 's/-lgcc_eh//g' -i Makeconfig
 }
+
+# For Glibc to support NPTL:
+hvconfig_cache()
+{
+cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+libc_cv_forced_unwind=yes
+libc_cv_c_cleanup=yes
+libc_cv_gnu89_inline=yes
+libc_cv_ssp=no
+EOF
+}
+
+hvconfig_post()
+{
+    unset BUILD_CC
+    unset CC
+    unset AR
+    unset RANLIB
+    unset CFLAGS
+}