X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fstage4-install;h=73f2c71b4f8b671c65f61be59287c34d49ce7333;hb=907fcfdccdd0ddd33accef87490f9e0b750797ad;hp=0bffeb0a7ca1244d08673a9860672964e36dbb4e;hpb=80b7cf97e54dcc2b102b89d00e7963161c4cb639;p=hvlinux.git

diff --git a/stage4/stage4-install b/stage4/stage4-install
index 0bffeb0..73f2c71 100755
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -28,19 +28,127 @@ export XORG_CONFIG="\
     --mandir=${XORG_PREFIX}/share/man \
     --localstatedir=/var"
 
-MOD_NAME=$(get_pkg_name ${XORG_PROTO})
-
 LFS_PKG_DIR_ORIG=${LFS_PKG_DIR}
 
-# build packages
-for package in $(grep -v '^#' ${LFS_PKG_DIR}/${XORG_PROTO}.wget); do
-    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${MOD_NAME}
-    SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
-    ##echo PKG=$SUBMOD
-    ipkg_ac ${SUBMOD} ${XORG_CONFIG}
-done
+# Arg #1: module name and version
+# Arg #2: subdirectory
+# Arg #3: optional configure arguments
+ipkg_xorg()
+{
+    local MODULE=${1}
+    local SUBDIR=${2}
+    shift 2
+    local CONFIGURE_OPTS=${*}
+
+    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${SUBDIR}
+    ipkg_ac ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS}
+    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
+}
+
+# Install all submodules in a module
+#
+# Arg #1: module name and version
+# Arg #2: optional configure arguments
+install_xorg_modules()
+{
+    local MODULE=${1}
+    shift
+    local CONFIGURE_OPTS=${*}
+
+    local MODULE_NAME=$(get_pkg_name ${MODULE})
+
+    local MY_XORG_CONFIG
+
+    for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE_NAME}/${MODULE}.wget); do
+        SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
+
+        # Special configure options for specific packages
+        case ${SUBMOD} in
+            libXfont-[0-9]* )
+                MY_XORG_CONFIG="--disable-devel-docs"
+                ;;
+            libX11-[0-9]* )
+                MY_XORG_CONFIG="--without-xcb"
+                ;;
+            libXt-[0-9]* )
+                MY_XORG_CONFIG="--with-appdefaultdir=/etc/X11/app-defaults"
+                ;;
+            xinit-[0-9]* )
+                MY_XORG_CONFIG="--with-xinitdir=/etc/X11/app-defautls"
+                ;;
+        esac
+
+        ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
+    done
+}
+
+install_xorg_modules ${XORG_PROTO}
+install_xorg_modules ${XORG_UTIL}
+ipkg_xorg ${LIBXAU} "lib"
+ipkg_xorg ${LIBXDMCP} "lib"
+install_xorg_modules ${XORG_LIB}
+ipkg_cust ${LESSTIF} cis-lesstif \
+    --sysconfdir=/etc/X11 \
+    --disable-debug \
+    --disable-build-tests \
+    --enable-production \
+    --with-xdnd \
+    --x-includes=$XORG_PREFIX/include \
+    --x-libraries=$XORG_PREFIX/lib
+ipkg_xorg ${XBITMAPS} "data"
+ipkg_ac   ${LIBPTHREAD_STUBS}
+ipkg_ac   ${LIBDRM} --enable-udev
+ipkg_cust ${MESALIB} cis-mesalib --enable-motif
+install_xorg_modules ${XORG_APP}
+ipkg_xorg ${XCURSOR_THEMES} "data"
+install_xorg_modules ${XORG_FONT}
+rscr once "Configuring fonts" configure-fonts
+ipkg_ac   ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
+ipkg_xorg ${LUIT} "app"
+ipkg_ac   ${PIXMAN}
+ipkg_ac   ${LIBFFI}
+ipkg_cust ${DBUS} cis-dbus
+ipkg_cust ${GLIB} cis-glib --with-pcre=system
+ipkg_ac   ${GOBJECT_INSTROSPECTION}
+ipkg_ac   ${DBUS_GLIB} \
+    --disable-tests \
+    --disable-dependency-tracking \
+    --libexecdir=/usr/lib/dbus-1.0/dbus-1
+ipkg_ac   ${EGGDBUS}
+ipkg_cust ${POLKIT} cis-polkit
+ipkg_ac_nb ${CONSOLEKIT} \
+    --libexecdir=/usr/lib/ConsoleKit \
+    --localstatedir=/var \
+    --enable-pam-module
+ipkg_cust ${POLICYKIT} cis-policykit
+ipkg_cust ${HAL} cis-hal
+ipkg_ac   ${HAL_INFO}
+
+ipkg_xorg ${XORG_SERVER} "xserver" "\
+    --with-module-dir=${XORG_PREFIX}/lib/X11/modules \
+    --with-xkb-output=/var/lib/xkb \
+    --enable-install-setuid \
+    --disable-config-hal"
+
+# newport, vmware, and xgixp drivers cause Xorg -configure to hang
+# To fix this problem, comment out these drivers in both driver-7.5-2.md5 and driver-7.5-2.wget.
+install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=${XORG_PREFIX}/lib/X11/modules
+
+ipkg_xorg ${XDM} "app"
+
+rscr once "Configuring X.org" configure-xorg
+
+ipkg_cust ${XTERM} cis-xterm ${XORG_CONFIG}
+
+ipkg_cust ${T1LIB} cis-t1lib
+
+ipkg_cust ${TK}  cis-tk
 
+# Re-installing python now that tk is present???
+ipkg_ac   ${PYTHON} "--enable-shared"
 
+ipkg_cust ${WINDOWMAKER} cis-windowmaker
+ipkg_ac   ${WINDOWMAKER_EXTRA}
 
 #source /etc/profile