-Cleaned-up name of ipkg functions in package definition files.

[hvlinux.git] / stage0 / install-1

diff --git a/stage0/install-1 b/stage0/install-1
index af1cd15..786c754 100755 (executable)
--- a/stage0/install-1
+++ b/stage0/install-1
@@ -16,33 +16,48 @@ export LFS_TMP="${LFS}/tmp"
 
 init_log_file
 
-ipkg_cust ${KERNEL}   cis-linux-api-headers
+# Scripts directory
+export SCRDIR=$(pwd)
+
+ipkg_ac   ${KERNEL}
 
 case "${HVL_TARGET}" in
     x86*)
         ipkg_ac   ${FILE_PKG}
-        ipkg_cust ${NCURSES}  cis-ncurses "--without-debug --without-shared"
+        ipkg_ac   ${NCURSES} "\
+            --without-debug \
+            --without-shared"
         ;;
 esac
 
 CPPFLAGS=-fexceptions \
     ipkg_ac   ${GMP}  "--enable-cxx"
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ipkg_ac   ${MPFR} "--enable-shared --with-gmp=/cross-tools"
-
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ipkg_ac   ${PPL}  "--enable-shared \
-        --enable-interfaces=c,cxx \
-        --disable-optimization \
-        --with-libgmp-prefix=/cross-tools \
-        --with-libgmpxx-prefix=/cross-tools"
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ipkg_cust ${CLOOG_PPL} cis-cloog-ppl "--enable-shared --with-bits=gmp \
-        --with-gmp=/cross-tools --with-ppl=/cross-tools"
-
-ipkg_cust ${BINUTILS} cis-binutils
-ipkg      ${GCC_CORE} cis-gcc-pass1 "${GCC_CORE}-pass1"
-ipkg_cust ${EGLIBC} cis-eglibc
-ipkg      ${GCC_CORE} cis-gcc-pass2 "${GCC_CORE}-pass2"
+
+export LDFLAGS="-Wl,-rpath,/cross-tools/lib"
+
+ipkg_ac   ${MPFR} "\
+    --enable-shared \
+    --with-gmp=/cross-tools"
+ipkg_ac   ${MPC} "\
+    --with-gmp=/cross-tools \
+    --with-mpfr=/cross-tools"
+ipkg_ac   ${PPL} "\
+    --enable-shared \
+    --enable-interfaces=c,cxx \
+    --disable-optimization \
+    --with-libgmp-prefix=/cross-tools \
+    --with-libgmpxx-prefix=/cross-tools"
+ipkg_ac   ${CLOOG_PPL} "\
+    --enable-shared \
+    --with-bits=gmp \
+    --with-gmp=/cross-tools \
+    --with-ppl=/cross-tools"
+
+LDFLAGS=""
+
+ipkg_ac ${BINUTILS}
+GCC_PASS1="1" ipkg ${GCC} cis-ac "${GCC}-pass1"
+ipkg_ac ${EGLIBC}
+GCC_PASS2="1" ipkg ${GCC} cis-ac "${GCC}-pass2"
 
 exit $?