X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fhv-install-1;h=960bdedd861b9fc46569dc25c76943af1cc80059;hb=496fe638ddb82977bb02578cc9e1c39ffcc8c41e;hp=8f0a3fa3c03add23f809940021a1f155765e3221;hpb=a499ee54f561336f069a7f664a11c4970c9248bc;p=hvlinux.git

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 8f0a3fa..960bded 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -21,14 +21,18 @@ ipkg -j ${FCRON}
 ipkg ${OPENSSH}
 ipkg -s lynx ${LYNX}
 ipkg ${EXPAT}
-ipkg ${APR} "--with-installbuilddir=/usr/lib/apr-1/build"
-ipkg ${APR_UTIL} "--with-apr=/usr/bin/apr-1-config"
+ipkg ${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}
 CFLAGS="${CFLAGS} -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY=1" \
     ipkg ${SQLITE} "--enable-threadsafe --enable-readline --enable-dynamic-extensions"
 ipkg -j ${SUBVERSION} "--without-berkeley-db"
-ipkg ${SUDO}
+ipkg ${SUDO} "--libexecdir=/usr/lib/sudo \
+    --with-all-insults \
+    --with-env-editor \
+    --without-pam \
+    --without-sendmail"
 ipkg ${STRACE}
 ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \
     --enable-utf8 \
@@ -60,15 +64,20 @@ ipkg ${CURL}
 ipkg ${RSYNC}
 ipkg -m noac ${GETDATE}
 
-if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    ipkg ${MYSQL}
-fi
+ipkg -m acnb ${LIBARCHIVE} "--disable-static"
+ipkg -m acnb ${CMAKE}
+ipkg -m acnb ${MYSQL}
 
 # Archiving
 ipkg -m noac ${ZIP}
 ipkg -m noac ${UNZIP}
 ipkg -m noac ${UNRAR}
-ipkg ${CPIO}
+ipkg -m noac ${P7ZIP}
+ipkg ${CPIO} "\
+    --bindir=/bin \
+    --libexecdir=/tmp \
+    --enable-mt \
+    --with-rmt=/usr/sbin/rmt"
 
 ipkg ${SCREEN}
 
@@ -89,7 +98,10 @@ ipkg -m noac ${COLORDIFF}
 
 ipkg ${INTLTOOL}
 
-ipkg -m acnb ${GIT}
+ipkg -m acnb ${GIT} "--libexecdir=/usr/lib --with-gitconfig=/etc/gitconfig"
+ipkg -m noac ${MERCURIAL}
+
+ipkg ${DIALOG}
 
 # DocBook
 ipkg -m acnb ${SGML_COMMON}
@@ -129,7 +141,7 @@ ipkg -m noac ${CKERMIT}
 ipkg ${LIBTASN1}
 ipkg ${LIBUNISTRING}
 ipkg ${BDWGC}
-ipkg ${GUILE} \
+ipkg ${GUILE2} \
     --enable-posix \
     --disable-static \
     --enable-networking \
@@ -187,6 +199,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${LIBTHEORA}
         ipkg ${XVIDCORE}
 
+        ipkg ${LIBX264} "--enable-shared"
+
         # Audio libraries
 	ipkg -m acnb ${AUDIOFILE}
         ipkg ${PORTAUDIO}