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

[hvlinux.git] / stage1 / install-1

diff --git a/stage1/install-1 b/stage1/install-1
index c23163a..be2fd3e 100755 (executable)
--- a/stage1/install-1
+++ b/stage1/install-1
@@ -42,14 +42,26 @@ ipkg_ac   ${CLOOG_PPL} "\
     --with-bits=gmp \
     --with-gmp=/tools \
     --with-ppl=/tools"
-ipkg_cust ${ZLIB} cis-zlib
+ipkg_ac   ${ZLIB}
 ipkg_ac   ${BINUTILS} "\
     --target=${CLFS_TARGET} \
     --with-lib-path=/tools/lib \
     --disable-nls \
     --enable-shared \
     --disable-multilib"
-ipkg_cust ${GCC} cis-gcc
+ipkg_ac   ${GCC} "\
+    --target=${CLFS_TARGET} \
+    --disable-multilib \
+    --with-local-prefix=/tools \
+    --libexecdir=/tools/lib \
+    --disable-nls \
+    --disable-libstdcxx-pch \
+    --enable-long-long \
+    --enable-c99 \
+    --enable-shared \
+    --enable-threads=posix \
+    --enable-__cxa_atexit \
+    --enable-languages=c,c++"
 ipkg_ac   ${NCURSES} "\
     --with-shared \
     --without-debug \
@@ -58,14 +70,14 @@ ipkg_ac   ${NCURSES} "\
     --with-build-cc=gcc"
 ipkg_ac   ${BASH} "--without-bash-malloc"
 ipkg_ac   ${BISON}
-ipkg_cust ${BZIP2} cis-bzip2
+ipkg_ac   ${BZIP2}
 ipkg_ac   ${COREUTILS} "--enable-install-program=hostname"
 ipkg_ac   ${DIFFUTILS}
 ipkg_ac   ${FINDUTILS}
 ipkg_ac   ${FILE_PKG}
 ipkg_ac   ${FLEX}
 ipkg_ac   ${GAWK}
-ipkg_cust ${GETTEXT} cis-gettext
+ipkg_ac   ${GETTEXT} "--disable-shared"
 ipkg_ac   ${GREP} "\
     --disable-perl-regexp \
     --without-included-regex"
@@ -83,17 +95,17 @@ rscr once "Creating directory structure" create-directories
 rscr once "Creating symbolic links" create-symlinks
 
 ipkg_ac   ${NANO} "--enable-color --enable-multibuffer"
-ipkg_cust ${UTIL_LINUX_NG} cis-util-linux-ng
-ipkg_cust ${E2FSPROGS} cis-e2fsprogs
-ipkg_cust ${SYSVINIT} cis-sysvinit
-ipkg_cust ${MODULE_INIT_TOOLS} cis-module-init-tools
-ipkg_cust ${UDEV} cis-udev
+ipkg_ac   ${UTIL_LINUX_NG}
+ipkg_ac   ${E2FSPROGS}
+ipkg_ac   ${SYSVINIT}
+ipkg_ac   ${MODULE_INIT_TOOLS}
+ipkg_ac   ${UDEV}
+ipkg_ac   ${KERNEL}
 
 rscr once "Creating default users" create-users
 rscr once "Creating default groups" create-groups
 rscr once "Creating default log files" create-logfiles
-rscr once "Installing kernel sources" install-linux-minimal
 rscr once "Creating default config files" create-config-files
-rscr once "Installing bootscripts" cis-bootscripts
+rscr once "Installing bootscripts" install-bootscripts
 
 exit $?