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 bfcc153..253e6d9 100755 (executable)
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -10,7 +10,8 @@ rscr mult "Performing pre-install" pre-install
 
 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
@@ -19,11 +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}
-ipkg ${CLOOG} "--enable-shared"
+ipkg ${ISL}
+ipkg ${CLOOG} "--with-isl=system"
 
 unset CC
 unset CXX
@@ -45,7 +46,10 @@ ipkg ${E2FSPROGS}
 ipkg -s "icu" ${ICU}
 ipkg -m noac ${GPTFDISK}
 
-FORCE_UNSAFE_CONFIGURE=1 ipkg  -m acnb ${COREUTILS}
+FORCE_UNSAFE_CONFIGURE=1 ipkg -m acnb ${COREUTILS} "\
+    --libexecdir=/usr/lib \
+    --enable-no-install-program=kill,uptime"
+
 ipkg -m noac ${IANA}
 ipkg ${MFOUR}
 ipkg -m noac ${PROCPS}