X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fhv-install-1;h=db8b3338e360b7ab631f759ab9e918b2b64c4e54;hb=cf3d9a3b194a6578c881cdd4eb528398d4de2741;hp=b1d2ca213f718d80497ea5a6ed92c09e0906c80e;hpb=d4c538dd077a095cacaa28bd6fff6f65e6fb3d84;p=hvlinux.git

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index b1d2ca2..db8b333 100755
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -9,10 +9,13 @@ init_log_file
 rscr mult "Performing pre-install" pre-install
 
 ipkg -m noac -l "kernel-headers" -s "kernel-headers" ${KERNEL}
+ipkg -m acnb -j -l "${PERL}-pass1" ${PERL}
 ipkg -m noac ${MANPAGES}
 ipkg ${GLIBC}
+ipkg -m noac -s tzdata -c ${TZDATA}
 
 rscr once "Adjusting toolchain" toolchain-adjust
+rscr once "Creating temporary C++ toolchain hack" toolchain-hack-cpp-add
 rscr mult "Testing toolchain"   toolchain-test
 
 export CC="gcc -isystem /usr/include"
@@ -20,7 +23,7 @@ export CXX="g++ -isystem /usr/include"
 export LDFLAGS="-Wl,-rpath-link,/lib"
 
 ipkg ${GMP} "--enable-cxx"
-ipkg ${MPFR} "--enable-shared --with-gmp=/usr"
+ipkg ${MPFR} "--with-gmp=/usr"
 ipkg ${MPC}
 ipkg ${ISL}
 ipkg ${CLOOG} "--with-isl=system"
@@ -32,6 +35,7 @@ unset LDFLAGS
 ipkg -m acnb ${ZLIB}
 ipkg ${BINUTILS}
 ipkg ${GCC}
+rscr once "Deleting temporary C++ toolchain hack" toolchain-hack-cpp-remove
 rscr mult "Testing toolchain" toolchain-test
 ipkg ${SED} "--bindir=/bin"
 ipkg ${LIBFFI}
@@ -42,17 +46,20 @@ ipkg ${PKG_CONFIG}
 ipkg ${NCURSES}
 ipkg ${UTIL_LINUX}
 ipkg ${E2FSPROGS}
-ipkg -s "icu" ${ICU}
+ipkg -d source ${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}
 ipkg ${LIBTOOL}
 ipkg ${FLEX}
-ipkg ${PERL}
-ipkg ${BISON}
+ipkg -m acnb -l "${PERL}-pass2" ${PERL}
+ipkg -m acnb ${BISON}
 ipkg -m noac ${IPROUTE2}
 ipkg ${READLINE}
 ipkg ${AUTOCONF}