Update gettext for new ipkg() -d option

[hvlinux.git] / stage1 / hv-install-2

diff --git a/stage1/hv-install-2 b/stage1/hv-install-2
index 89929ce..dcd147d 100755 (executable)
--- a/stage1/hv-install-2
+++ b/stage1/hv-install-2
@@ -8,9 +8,8 @@ init_log_file
 
 # Building temporary system
 
-HOST_CC=gcc CPPFLAGS=-fexceptions \
-    ipkg ${GMP} "--enable-cxx"
-ipkg ${MPFR} "--enable-shared"
+ipkg ${GMP} "--enable-cxx"
+ipkg ${MPFR}
 ipkg ${MPC}
 ipkg ${ISL}
 ipkg ${CLOOG} "\
@@ -33,7 +32,7 @@ ipkg ${FINDUTILS}
 ipkg ${FILE_PKG}
 ipkg ${FLEX}
 ipkg ${GAWK}
-ipkg ${GETTEXT}
+ipkg -d gettext-tools ${GETTEXT} "--disable-shared"
 ipkg ${GREP} "\
     --disable-perl-regexp \
     --without-included-regex"
@@ -58,15 +57,14 @@ PKG_CONFIG=true \
         --disable-sulogin \
         --disable-su \
         --disable-makeinstall-chown"
-ipkg ${SHADOW} "\
+ipkg -i ${LFS} ${SHADOW} "\
     --sysconfdir=/etc \
     --cache-file=config.cache"
-ipkg ${E2FSPROGS}
+LDFLAGS="-Wl,-lpthread,-ldl" \
+    ipkg ${E2FSPROGS}
 ipkg -m noac ${SYSVINIT}
-ipkg ${KMOD}
-
-LDFLAGS="-Wl,-rpath,/tools/lib:/lib" \
-    ipkg ${EUDEV}
+ipkg -i ${LFS} ${KMOD} "--bindir=/bin"
+ipkg ${EUDEV}
 ipkg -c -m noac ${KERNEL}
 
 rscr once "Creating default users" create-users