[Mesa-dev] src/mesa/x86/*S sources not being built

[Jon TURNEY]

On 16/07/2012 20:22, Brian Paul wrote:
> I was going to look at a recently reported regression with the swrast driver
> but Mesa's not building properly.  I configured with:
> 
> CFLAGS=-g ./autogen.sh --enable-xlib-glx --with-x --disable-driglx-direct
> --disable-dri --enable-debug
> 
> libGL.so gets built but anything I try to run fails with:
> 
> glxinfo: symbol lookup error: /home/brian/mesa/lib/libGL.so.1: undefined
> symbol: _mesa_3dnow_transform_points4_2d
> 
> It looks like none of the src/mesa/x86/*.S or src/mesa/x86-64/*.S files are
> getting built.

The problem I see is that these files are built, but don't get any useful
contents as I failed to convert setting the preprocessor flags correctly.

Please try the attached patch.
-------------- next part --------------
>From 6c634c6034b18ace91aec88dd185787ff30f6113 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Mon, 16 Jul 2012 21:14:43 +0100
Subject: [PATCH] Fix building mesa with assembly enabled since a112ca5d

a112ca5d rather crassly smashed all the compiler flags together into AM_CFLAGS.
Separate then out the way they were before, putting pre-processor flags into
AM_CPPFLAGS, so assembly source gets preprocessed with the correct pre-processor
flags as well.

Also, remove unneeded CFLAGS from AM_CFLAGS, and CXXFLAGS from AM_CXXFLAGS
---
 src/mesa/Makefile.am |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index a454a32..584458b 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -102,8 +102,9 @@ noinst_LTLIBRARIES = libmesa.la libmesagallium.la
 SRCDIR = $(top_srcdir)/src/mesa
 include sources.mak
 
-AM_CFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) $(LLVM_CFLAGS) $(CFLAGS)
-AM_CXXFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) $(LLVM_CFLAGS) $(CXXFLAGS)
+AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
+AM_CFLAGS = $(LLVM_CFLAGS)
+AM_CXXFLAGS = $(LLVM_CFLAGS)
 
 # cannot just add $(MESA_ASM_FILES) to libmesa_la_SOURCES as it contains a configure substitution
 MESA_ASM_FILES_FOR_ARCH =
-- 
1.7.9