From 61bcecb9549a52135f16dc7be872655d34c2eac1 Mon Sep 17 00:00:00 2001 From: nobled Date: Mon, 4 Oct 2010 13:30:43 +0000 Subject: [PATCH 1/4] mesa: Add missing TALLOC_CFLAGS Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29789 It was just luck that this was working at all before. NOTE: This is a candidate for the 7.9 branch. --- src/mesa/Makefile | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mesa/Makefile b/src/mesa/Makefile index c41c38c..cbc8733 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -42,10 +42,11 @@ ES2_CPPFLAGS += -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS) CFLAGS := $(filter-out $(DEFINES), $(CFLAGS)) CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS)) -# LLVM is needed for the state tracker -MESA_CFLAGS := $(LLVM_CFLAGS) -ES1_CFLAGS := $(LLVM_CFLAGS) -ES2_CFLAGS := $(LLVM_CFLAGS) +# LLVM is needed for the state tracker; +# talloc is used in program/ and main/ +MESA_CFLAGS := $(LLVM_CFLAGS) $(TALLOC_CFLAGS) +ES1_CFLAGS := $(LLVM_CFLAGS) $(TALLOC_CFLAGS) +ES2_CFLAGS := $(LLVM_CFLAGS) $(TALLOC_CFLAGS) define mesa-cc-c @mkdir -p $(dir $@) -- 1.7.0.4