[Lunar-commits] <moonbase> mesa-lib: build fix for gallium

[Zbigniew Luszpinski]

commit 8e528b3c70fab8eddf17f9f2caa0a68c69a75819
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Thu May 26 01:58:56 2011 +0200

    mesa-lib: build fix for gallium
---
 xorg7/mesa-lib/BUILD     |   13 ++++++++-----
 xorg7/mesa-lib/CONFIGURE |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index 845c9f5..fc841ee 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -1,6 +1,11 @@
 (
 
+  # Detect VMware VGA virtual 3D card and add driver for it
+  VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'`
+
   if [[ -n $MESADRIVER ]] ; then
+    # Gallium build breaks with LDFLAGS set so turn it off for now
+    bad_flags linker
     # Build selected drivers only, rather than the default of all of them
     # Ensure that swrast is included, as a fall-back
     OPTS+=" --with-dri-drivers=swrast,"
@@ -22,13 +27,11 @@
     if [[ $MESADRIVER == *r600* ]]; then
       OPTS+=" --enable-gallium-r600 "
     fi
+    if [[ $VGA == *VMware* ]]; then
+      OPTS+=" --enable-gallium-svga "
+    fi
   fi  &&
 
-  # Detect VMware VGA virtual 3D card and add driver for it
-  VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'`
-  if [[ $VGA == *VMware* ]]; then
-     OPTS+=" --enable-gallium-svga "
-  fi &&
 
   # Don't overlap with freeglut
   OPTS+=" --disable-glut"  &&
diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
index 1fb388e..b8f7d2f 100644
--- a/xorg7/mesa-lib/CONFIGURE
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -1,5 +1,5 @@
 # swrast is always included, in BUILD
-# nouveau is removed from the list because it fails to build
+# nouveau is removed from the list because it fails to build in mesa 7.10.2
 SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis tdfx unichrome"
 
 make_drivers_checklist() {