From c3c91a0fe5e9a497c44481bcd072093e6edaac50 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@gmail.com>
Date: Mon, 7 Mar 2011 21:15:02 +0100
Subject: glx: Take GLPROTO_CFLAGS into account.

---
 configs/autoconf.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configs')

diff --git a/configs/autoconf.in b/configs/autoconf.in
index a3c69e1..4e931a3 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -149,6 +149,7 @@ DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
 LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
 LIBDRM_LIB = @LIBDRM_LIBS@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
+GLPROTO_CFLAGS = @GLPROTO_CFLAGS@
 EXPAT_INCLUDES = @EXPAT_INCLUDES@
 
 # Autoconf directories
-- 
cgit v1.1


From e6314db0ac537695a20feb5fab8d77a30836eccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Sun, 13 Mar 2011 19:24:26 +0000
Subject: gallivm: Use LLVM MC disassembler, instead of udis86.

Included in LLVM 2.7+. Unlink udis86, should support all instructions that
LLVM can emit.
---
 configs/linux-llvm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-llvm b/configs/linux-llvm
index e699953..dde40a3 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -12,7 +12,7 @@ GALLIUM_DRIVERS_DIRS += llvmpipe
 OPT_FLAGS = -O3 -ansi -pedantic
 ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign
 
-DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86
+DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE
 
 # override -std=c99
 CFLAGS += -std=gnu99
@@ -41,4 +41,4 @@ else
 endif
 
 LD = g++
-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++ -ludis86
+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++
-- 
cgit v1.1


From 202c345c7cf5074c0d0be208067c072c2f53535a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Mon, 14 Mar 2011 19:58:22 +0000
Subject: autoconf/make: Don't specify individual llvm libraries.

We need more and more of these, and it is difficult and prone to version
incompatability issues trying to single out every one of them.

This mimicks what was done in SCons.
---
 configs/linux-llvm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-llvm b/configs/linux-llvm
index dde40a3..359bee2 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -31,9 +31,9 @@ endif
 
 ifeq ($(MESA_LLVM),1)
   LLVM_CFLAGS=`llvm-config --cppflags`
-  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
-  LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation)
-  LLVM_LIBS = $(shell llvm-config --libs backend bitwriter bitreader engine ipo interpreter instrumentation)
+  LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
+  LLVM_LDFLAGS = $(shell llvm-config --ldflags)
+  LLVM_LIBS = $(shell llvm-config --libs)
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=
-- 
cgit v1.1