build Xorg with read-only source tree

Jeremy C. Reed reed at reedmedia.net
Wed Mar 15 23:13:28 PST 2006


> But I wouldn't be surprised if there are a lot of srcdir == builddir
> assumptions.

Okay I will check for that.

For now, may I commit the "work directory" related parts to this following 
patch?

(I do not know why the diff below doesn't show any change for the "cd" 
line since it is indented.)

(Unrelated: may I commit the "sun" drivers patch as a separate commit?)

Index: modular/build.sh
===================================================================
RCS file: /cvs/xorg/util/modular/build.sh,v
retrieving revision 1.68
diff -b -u -r1.68 build.sh
--- modular/build.sh	6 Mar 2006 17:43:01 -0000	1.68
+++ modular/build.sh	16 Mar 2006 07:08:51 -0000
@@ -24,7 +24,14 @@
 	fi
     fi
     echo "Building $1 module component $2..."
+
+    if test x"$WRKDIR" = x; then
     cd $1/$2
+    else
+	mkdir -p $WRKDIR/$1/$2
+	cd $WRKDIR/$1/$2
+	echo Current working directory is `pwd`
+    fi
 
     if test "$1" = "xserver" && test "$2" = "xorg" && test -n "$MESAPATH"; then
 	MESA=-"-with-mesa-source=${MESAPATH}"
@@ -33,7 +40,7 @@
     fi
 
     # Use "sh autogen.sh" since some scripts are not executable in CVS
-    sh autogen.sh --prefix=${PREFIX} ${MESA} ${QUIET:+--quiet} \
+    sh $STARTDIR/$1/$2/autogen.sh --prefix=${PREFIX} ${MESA} ${QUIET:+--quiet} \
         ${CACHE:+--cache-file=}${CACHE} ${CONFFLAGS} || failed autogen $1 $2
     make || failed make $1 $2
     if test x"$CLEAN" = x1; then
@@ -346,6 +353,22 @@
 	    ;;
     esac
 
+    # Do not install some sun* drivers on some operating systems
+    case $HOST_OS in
+	*DragonFly*)
+	    # do nothing
+	    ;;
+	*)
+    	    build driver xf86-video-sunbw2
+	    build driver xf86-video-suncg14
+	    build driver xf86-video-suncg3
+	    build driver xf86-video-suncg6
+ 	    build driver xf86-video-sunleo
+ 	    build driver xf86-video-suntcx
+	    ;;
+    esac
+		
+
     build driver xf86-video-apm
     build driver xf86-video-ark
     build driver xf86-video-ati
@@ -371,12 +394,6 @@
     build driver xf86-video-savage
     build driver xf86-video-siliconmotion
     build driver xf86-video-sis
-    build driver xf86-video-sunbw2
-    build driver xf86-video-suncg14
-    build driver xf86-video-suncg3
-    build driver xf86-video-suncg6
-    build driver xf86-video-sunleo
-    build driver xf86-video-suntcx
     build driver xf86-video-tdfx
     build driver xf86-video-tga
     build driver xf86-video-trident
@@ -479,6 +496,7 @@
     echo "  -m path-to-mesa-sources-for-xserver : full path to Mesa sources"
     echo "  -n : do not quit after error; just print error message"
     echo "  -s sudo-command : sudo command to use"
+    echo "  -w path-to-work-directory : full path to work directory"
 }
 
 # Process command line args
@@ -509,6 +527,11 @@
 	shift
 	RESUME=$1
 	;;
+    -w)
+	shift
+	WRKDIR=$1
+	STARTDIR=`pwd` # assuming in top level of source
+	;;
     *)
 	PREFIX=$1
 	;;

 Jeremy C. Reed

echo ':6DB6=88>?;@69876tA=AC8BB5tA6487><' | tr '4-F' 'wu rofIn.lkigemca'



More information about the xorg mailing list