Couple enhancements to build.sh. The first patch simply adds Mesa and libdrm support.

The second patch adds the capability to customize configure flags for modules and components. It's done by passing in a file on the command line which is in the following format:

all: --extra-config-flags-to-all-components
module: --extra-config-flags-for-just-this-module
module/component: --extra-config-flags-for-just-this-component

-Rob



CONFIDENTIALITY NOTICE: This E-Mail is intended only for the use of the individual or entity to which it is addressed and may contain information that is privileged, confidential and exempt from disclosure under applicable law. If you have received this communication in error, please do not distribute it. Please notify the sender by E-Mail at the address shown and delete the original message.
--- build.sh            2008-09-08 23:02:36.613709784 -0400
+++ build.sh.addmesa    2008-09-19 13:31:00.792075918 -0400
@@ -41,6 +41,12 @@
                 "libxtrans") C="xtrans" ;;
             esac
             ;;
+        "mesa")
+            case $C in
+                "drm") C="libdrm" ;;
+                "mesa") C="Mesa" ;;
+            esac
+            ;;
         "pixman")
             M="lib"
             C="pixman"
@@ -387,7 +393,7 @@
 
 build_mesa() {
     build mesa drm
-    #build mesa mesa
+    build mesa mesa
 }
 
 # The server requires at least the following libraries:
--- build.sh            2008-09-08 23:02:36.613709784 -0400
+++ build.sh.confflags  2008-09-19 13:37:58.900804394 -0400
@@ -137,6 +137,12 @@
        MOD_SPECIFIC="--with-xcb=no"
     fi
 
+    if test x"$CONFFLGFILE" != x && test -e $CONFFLGFILE; then
+        MOD_SPECIFIC="$MOD_SPECIFIC `grep all: $CONFFLGFILE | cut -d : -f 2-`"
+        MOD_SPECIFIC="$MOD_SPECIFIC `grep $1: $CONFFLGFILE | cut -d : -f 2-`"
+        MOD_SPECIFIC="$MOD_SPECIFIC `grep $1/$2: $CONFFLGFILE | cut -d : -f 
2-`"
+    fi
+
     LIB_FLAGS=
     if test x$LIBDIR != x ; then
         LIB_FLAGS="--libdir=${PREFIX}/${LIBDIR}"
@@ -616,6 +622,7 @@
     echo "  -a : do NOT run auto config tools (autogen.sh, configure)"
     echo "  -b : use .build.$HAVE_ARCH build directory"
     echo "  -c : run make clean in addition to others"
+    echo "  -C configure-flags-file : file with configure flags"
     echo "  -d : run make distcheck in addition to others"
     echo "  -D : run make dist in addition to others"
     echo "  -g : build with debug information"
@@ -643,6 +650,10 @@
     -c)
        CLEAN=1
        ;;
+    -C)
+       shift
+       CONFFLGFILE=$1
+       ;;
     -d)
        DISTCHECK=1
        ;;
_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg

Reply via email to