[PATCH] build.sh tar M/C for xcb, mesa, xkeyboard

linux fan linuxscratch at gmail.com
Sat Nov 6 14:29:11 PDT 2010


Use same xcb module subdirs as git.
Mesa and xkeyboard-config tarballs were not being found.
MesaLib unpacks to Mesa, so sed is required to adjust its SRCDIR.
These tarballs work alternatively in topdir.
Note: The absence of autogen.sh triggers checkfortars() function.
---
 build.sh |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 275a1e1..512da80 100755
--- a/build.sh
+++ b/build.sh
@@ -131,11 +131,39 @@ checkfortars() {
             ;;
         "xcb")
             case $C in
-                "proto") C="xcb-proto" ;;
-                "pthread-stubs") M="lib"; C="libpthread-stubs" ;;
-                "util") C="xcb-util" ;;
+                "proto")
+                    M="xcb/proto"
+                    C="xcb-proto"
+                    ;;
+                "pthread-stubs")
+                    M="xcb/pthread-stubs"
+                    C="libpthread-stubs"
+                    ;;
+                "libxcb")
+                    M="xcb/libxcb"
+                    C="libxcb"
+                    ;;
+                "util")
+                    M="xcb/util"
+                    C="xcb-util"
+                    ;;
             esac
             ;;
+        "mesa")
+            case $C in
+                "drm")
+                    M="mesa/drm"
+                    C="libdrm"
+                    ;;
+                "mesa")
+                    M="mesa/mesa"
+                    C="MesaLib"
+                    ;;
+            esac
+            ;;
+        "xkeyboard-config")
+            C="xkeyboard-config"
+            ;;
         "xserver")
             C="xorg-server"
             ;;
@@ -145,6 +173,7 @@ checkfortars() {
             TARFILE=`ls -1rt $ii/$C-*.tar.$jj 2> /dev/null | tail -n 1`
             if [ X"$TARFILE" != X ]; then
                 SRCDIR=`echo $TARFILE | sed "s,.tar.$jj,,"`
+                SRCDIR=`echo $SRCDIR | sed "s,MesaLib,Mesa,"`
                 if [ ! -d $SRCDIR ]; then
                     TAROPTS=xjf
                     if [ X"$jj" = X"gz" ]; then
-- 
1.7.3.1



More information about the xorg-devel mailing list