Update for new BUILD_DIR and SRC_DIR variables

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

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 1c8b56a..3769565 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -24,7 +24,7 @@ ipkg -j ${FCRON}
 ipkg ${OPENSSH}
 ipkg -s lynx ${LYNX}
 ipkg ${EXPAT}
-ipkg ${APR} "--disable-static --with-installbuilddir=/usr/share/apr-1/build"
+ipkg -j ${APR} "--disable-static --with-installbuilddir=/usr/share/apr-1/build"
 ipkg ${APR_UTIL} "--with-apr=/usr --with-gdbm=/usr -with-openssl=/usr"
 ipkg ${NEON} "--with-ssl"
 ipkg -s tcl ${TCL}
@@ -47,7 +47,7 @@ ipkg -m acnb ${HTOP}
 
 # Networking
 ipkg -m noac -s tcp_wrappers ${TCPWRAPPERS}
-ipkg -m acnb ${RPCBIND} "--bindir=/sbin --with-rpcuser=root"
+ipkg -m acnb ${RPCBIND} "--bindir=/sbin --with-rpcuser=root --with-systemdsystemunitdir=no"
 LIBS="-lpthread" ipkg -m acnb ${NFS_UTILS} " \
     --disable-nfsv4 \
     --disable-nfsv41 \
@@ -87,7 +87,7 @@ ipkg ${CPIO} "\
 
 ipkg ${SCREEN}
 
-ipkg ${PARTED} "--disable-device-mapper"
+ipkg ${PARTED} "--disable-static --disable-device-mapper"
 INIT_D_PATH=/etc/rc.d/init.d \
     ipkg -m acnb ${FUSE}
 ipkg -m noac ${DOSFSTOOLS}
@@ -116,7 +116,7 @@ ipkg -m acnb ${OPENJADE} "--enable-splibdir=/usr/lib"
 ipkg -m noac ${DOCBOOK_DSSSL}
 ipkg -m noac ${SGML_SPM}
 ipkg ${DOCBOOK_UTILS}
-ipkg -m acnb ${LIBXML2}
+ipkg -m acnb ${LIBXML2} "--disable-static --with-history"
 ipkg -m acnb ${LIBXSLT}
 ipkg -m noac ${DOCBOOK_XML}
 ipkg -m noac ${DOCBOOK_XSL}
@@ -139,10 +139,10 @@ ipkg ${LIBART}
 ipkg ${LIBEXIF}
 ipkg ${FRIBIDI}
 ipkg -m acnb ${HICOLOR_ICON_THEME}
-ipkg ${GIFLIB}
-ipkg -m noac ${LIBMNG}
+ipkg ${GIFLIB} "--disable-static"
+ipkg -m acnb ${LIBMNG} "--disable-static"
 
-ipkg ${FREETYPE}
+ipkg ${FREETYPE} "--disable-static"
 ipkg ${FONTCONFIG}
 
 ipkg -m noac ${CKERMIT}
@@ -158,7 +158,7 @@ ipkg ${GUILE2} \
 ipkg ${LIBGPG_ERROR}
 ipkg ${LIBGCRYPT}
 ipkg ${NETTLE} "--libdir=/usr/lib"
-ipkg -m acnb ${GNUTLS}
+ipkg -m acnb ${GNUTLS} "--with-default-trust-store-file=/etc/ssl-ca-bundle.crt"
 
 # Mail
 ipkg -l "${SASL2}-pass1" -s "cyrus-sasl" ${SASL2}
@@ -172,7 +172,12 @@ else
     ipkg ${MSMTP}
 fi
 
-ipkg ${GNUPG} "--libexecdir=/usr/lib"
+ipkg -m acnb ${PTH} "\
+    --disable-static \
+    --mandir=/usr/share/man"
+ipkg ${LIBASSUAN}
+ipkg ${LIBKSBA}
+ipkg ${GNUPG} "-enable-symcryptrun"
 ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl --enable-hcache"
 
 ipkg ${YASM}