Finalise installation X.org, reste a tester...

[hvlinux.git] / stage4 / stage4-install

diff --git a/stage4/stage4-install b/stage4/stage4-install
index 0bffeb0..3443df7 100755 (executable)
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -28,18 +28,88 @@ 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
+# 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}.wget); do
+        LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${MODULE_NAME}
+        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"
+                ;;
+            xf86-video-s3-[0-9]* | xf86-video-xgi-[0-9]* )
+                #for file in `grep -Rl "xf86Version.h" *`; do
+                #    sed 's@xf86Version.h@xorgVersion.h@g' -i "$file"
+                #done
+                #;;
+        esac
+
+        ipkg_ac ${SUBMOD} ${XORG_CONFIG} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
+    done
+
+    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
+}
+
+install_xorg_modules ${XORG_PROTO}
+install_xorg_modules ${XORG_UTIL}
+ipkg_ac   ${LIBXAU} ${XORG_CONFIG}
+ipkg_ac   ${LIBXDMCP} ${XORG_CONFIG}
+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_ac   ${XBITMAPS} ${XORG_CONFIG}
+ipkg_ac   ${LIBPTHREAD_STUBS}
+ipkg_ac   ${LIBDRM} --enable-udev
+ipkg_cust ${MESALIB} cis-mesalib --enable-motif
+install_xorg_modules ${XORG_APP}
+ipkg_ac   ${XCURSOR_THEMES} ${XORG_CONFIG}
+install_xorg_modules ${XORG_FONT}
+rscr once "Configuring fonts" configure-fonts
+ipkg_ac   ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
+ipkg_ac   ${LUIT} ${XORG_CONFIG}
+ipkg_ac   ${PIXMAN}
+
+ipkg_cust ${DBUS} cis-dbus
+ipkg_cust ${GLIB} cis-glib --with-pcre=system
+ipkg_ac   ${DBUS_GLIB} "--disable-tests --disable-dependency-tracking --libexecdir=/usr/lib/dbus-1.0/dbus-1"
+ipkg_cust ${HAL} cis-hal
+ipkg_ac   ${HAL_INFO}
+
+ipkg_ac   ${XORG_SERVER} ${XORG_CONFIG} "\
+    --with-module-dir=${XORG_PREFIX}/lib/X11/modules \
+    --with-xkb-output=/var/lib/xkb \
+    --enable-install-setuid"
+
+install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=${XORG_PREFIX}/lib/X11/modules
+
+rscr once "Configuring X.org" configure-xorg
 
+exit 1
 
 
 #source /etc/profile