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

[hvlinux.git] / stage2 / stage2-install

diff --git a/stage2/stage2-install b/stage2/stage2-install
index f27c556..869ab96 100755 (executable)
--- a/stage2/stage2-install
+++ b/stage2/stage2-install
@@ -23,68 +23,54 @@ init_log_file
 # Scripts directory
 export SCRDIR=$(pwd)
 
-ipkg       ${PERL} cis-perl-pass1 "${PERL}-pass1"
-ipkg_cust  ${KERNEL} cis-kernel
-ipkg_cust  ${MANPAGES} cis-man-pages
-ipkg_cust  ${EGLIBC} cis-eglibc
+PERL_PASS1="1" ipkg ${PERL} cis-ac "${PERL}-pass1"
+ipkg_ac    ${KERNEL}
+ipkg_ac    ${MANPAGES}
+ipkg_ac    ${EGLIBC}
 rscr once  "Adjusting toolchain" cis-toolchain-adjust
 rscr mult  "Testing toolchain"   cis-toolchain-test
 
 CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
     CXX="g++ -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
-    ipkg_ac   ${GMP}  "--enable-cxx --enable-mpbsd"
+    ipkg_ac ${GMP} "--enable-cxx --enable-mpbsd"
 
 CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
-    ipkg_ac   ${MPFR} "--enable-shared --with-gmp=/usr"
+    ipkg_ac ${MPFR} "--enable-shared --with-gmp=/usr"
+
+CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
+    ipkg_ac ${MPC}
 
 CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
     CXX="g++ -isystem /usr/include" \
     LDFLAGS="-Wl,-rpath-link,/lib" \
-    ipkg_ac   ${PPL}  "--enable-shared --disable-optimization"
+    ipkg_ac ${PPL} "--enable-shared --disable-optimization"
 
 CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
-    ipkg_ac   ${CLOOG_PPL} "--enable-shared --with-gmp --with-ppl"
-
-CC="gcc -isystem /usr/include" CXX="g++ -isystem /usr/include" \
-    LDFLAGS="-Wl,-rpath-link,/lib" \
-    ipkg_cust  ${ZLIB} cis-zlib "--shared"
-
-CC="gcc -isystem /usr/include" \
-    LDFLAGS="-Wl,-rpath-link,/lib" \
-    ipkg_cust  ${BINUTILS} cis-binutils \
-    --libdir=/usr/lib \
-    --enable-shared \
-    --disable-multilib
-
-CC="gcc -Wl,-rpath-link,/lib -isystem /usr/include" \
-    CXX="g++ -Wl,-rpath-link,/lib -isystem /usr/include" \
-    ipkg_cust  ${GCC} cis-gcc \
-    --libexecdir=/usr/lib \
-    --enable-shared \
-    --enable-threads=posix \
-    --enable-__cxa_atexit \
-    --enable-c99 \
-    --enable-long-long \
-    --enable-clocale=gnu \
-    --enable-languages=c,c++ \
-    --disable-multilib \
-    --disable-libstdcxx-pch
+    ipkg_ac ${CLOOG_PPL} "--enable-shared --with-gmp --with-ppl"
 
+ipkg_ac ${ZLIB}
+ipkg_ac ${BINUTILS}
+ipkg_ac ${GCC}
 rscr mult  "Testing toolchain" cis-toolchain-test
 
-ipkg_ac    ${SED} "--bindir=/bin"
-ipkg_cust  ${PKG_CONFIG} cis-pkg-config
-ipkg_cust  ${NCURSES} cis-ncurses
-ipkg_cust  ${UTIL_LINUX_NG} cis-util-linux-ng
-ipkg_cust  ${E2FSPROGS} cis-e2fsprogs
-ipkg_cust  ${COREUTILS} cis-coreutils
-ipkg_cust  ${IANA} cis-iana
-ipkg_ac    ${MFOUR}
-ipkg_cust  ${BISON} cis-bison
-ipkg_cust  ${PROCPS} cis-procps
-ipkg_ac    ${GREP} "--bindir=/bin --without-included-regex"
-ipkg_cust  ${READLINE} cis-readline
-ipkg_ac    ${BASH} "--bindir=/bin --without-bash-malloc --with-installed-readline"
+ipkg_ac ${SED} "--bindir=/bin"
+ipkg_ac ${PKG_CONFIG}
+ipkg_ac ${NCURSES}
+ipkg_ac ${UTIL_LINUX_NG}
+ipkg_ac ${E2FSPROGS}
+ipkg_ac ${COREUTILS}
+HV_NO_CONFIGURE_SCRIPT=1 ipkg_ac ${IANA}
+ipkg_ac ${MFOUR}
+ipkg_ac ${BISON}
+ipkg_ac ${PROCPS}
+ipkg_ac ${LIBTOOL}
+ipkg_ac ${FLEX}
+ipkg_ac ${IPROUTE2}
+PERL_PASS2="1" ipkg ${PERL} cis-ac "${PERL}-pass2"
+ipkg_ac ${READLINE}
+ipkg_ac ${AUTOCONF}
+ipkg_ac ${AUTOMAKE}
+ipkg_ac ${BASH} "--bindir=/bin --without-bash-malloc --with-installed-readline"
 
 /bin/bash +h -c ./install-2