Remove configure options from custom scripts

[hvlinux.git] / stage2 / hv-install-1

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 5f00f8a..253e6d9 100755 (executable)
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -1,25 +1,18 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-hvtrap_setup
-source ../packages-list
+source ../functions/main
 source /etc/profile
 
-if [ "x${USER}" != "xroot" ]; then
-    echo "You must be the superuser to install hvlinux."
-    exit 1
-fi
-
+check_for_root_user
 init_log_file
 
 rscr mult "Performing pre-install" pre-install
 
-ipkg -l "${PERL}-pass1" ${PERL}
-ipkg -m noac ${KERNEL}
+ipkg -m noac -l "kernel-headers" -s "kernel-headers" ${KERNEL}
 ipkg -m noac ${MANPAGES}
-ipkg ${EGLIBC}
+ipkg ${GLIBC}
+ipkg -m noac -s tzdata -c ${TZDATA}
+
 rscr once "Adjusting toolchain" toolchain-adjust
 rscr mult "Testing toolchain"   toolchain-test
 
@@ -27,13 +20,11 @@ export CC="gcc -isystem /usr/include"
 export CXX="g++ -isystem /usr/include"
 export LDFLAGS="-Wl,-rpath-link,/lib"
 
-CPPFLAGS=-fexceptions \
-    ipkg ${GMP} "--enable-cxx --enable-mpbsd"
-ipkg ${MPFR} "--enable-shared --with-gmp=/usr"
+ipkg ${GMP} "--enable-cxx"
+ipkg ${MPFR} "--with-gmp=/usr"
 ipkg ${MPC}
-CPPFLAGS=-fexceptions \
-    ipkg ${PPL} "--enable-shared --disable-optimization"
-ipkg ${CLOOG_PPL} "--enable-shared --with-gmp --with-ppl"
+ipkg ${ISL}
+ipkg ${CLOOG} "--with-isl=system"
 
 unset CC
 unset CXX
@@ -44,19 +35,29 @@ ipkg ${BINUTILS}
 ipkg ${GCC}
 rscr mult "Testing toolchain" toolchain-test
 ipkg ${SED} "--bindir=/bin"
+ipkg ${LIBFFI}
+ipkg ${PYTHON} "--enable-shared"
+# Specify LIBFFI flags because pkg-config is not yet installed:
+LIBFFI_CFLAGS="-I/usr/include" LIBFFI_LIBS="-L/usr/lib -lffi" ipkg ${GLIB}
 ipkg ${PKG_CONFIG}
 ipkg ${NCURSES}
-ipkg ${UTIL_LINUX_NG}
+ipkg ${UTIL_LINUX}
 ipkg ${E2FSPROGS}
-ipkg ${COREUTILS}
+ipkg -s "icu" ${ICU}
+ipkg -m noac ${GPTFDISK}
+
+FORCE_UNSAFE_CONFIGURE=1 ipkg -m acnb ${COREUTILS} "\
+    --libexecdir=/usr/lib \
+    --enable-no-install-program=kill,uptime"
+
 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}