Attachment 69667 Details for Bug 56685 – Possible Fix

[patch] Possible Fix

0001-glsl-builtin_compiler-Makefile.am-Fix-build-by-make-.patch (text/plain), 1.74 KB, created by Johannes Obermayr on 2012-11-07 18:58:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Obermayr

Created: 2012-11-07 18:58:07 UTC

Size: 1.74 KB

patch

obsolete

>From 3eb7f2c39943ab4b68d021ebd4304606fc8cb151 Mon Sep 17 00:00:00 2001
>From: Johannes Obermayr <johannesobermayr@gmx.de>
>Date: Wed, 7 Nov 2012 19:49:10 +0100
>Subject: [PATCH] glsl/builtin_compiler/Makefile.am: Fix build by make use of
> $(GLSL_BUILDDIR) for build sources.
>
>- Add it to AM_CFLAGS
>- Built glsl_parser.cc is in $(GLSL_BUILDDIR)
>- Rearrange "include ../Makefile.sources" to make sure GLSL_SRCDIR and GLSL_BUILDDIR are defined before usage in AM_CFLAGS
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56685
>---
> src/glsl/builtin_compiler/Makefile.am |    7 ++++---
> 1 Datei geÃ¤ndert, 4 Zeilen hinzugefÃ¼gt(+), 3 Zeilen entfernt(-)
>
>diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
>index 72032b5..708d14c 100644
>--- a/src/glsl/builtin_compiler/Makefile.am
>+++ b/src/glsl/builtin_compiler/Makefile.am
>@@ -29,12 +29,15 @@ CXXFLAGS = @CXXFLAGS_FOR_BUILD@
> LD = @LD_FOR_BUILD@
> LDFLAGS = @LDFLAGS_FOR_BUILD@
> 
>+include ../Makefile.sources
>+
> AM_CFLAGS = \
> 	-I $(top_srcdir)/include \
> 	-I $(top_srcdir)/src/mapi \
> 	-I $(top_srcdir)/src/mesa \
> 	-I $(GLSL_SRCDIR) \
> 	-I $(GLSL_SRCDIR)/glcpp \
>+	-I $(GLSL_BUILDDIR) \
> 	$(DEFINES_FOR_BUILD)
> 
> AM_CXXFLAGS = $(AM_CFLAGS)
>@@ -42,8 +45,6 @@ AM_CXXFLAGS = $(AM_CFLAGS)
> AM_YFLAGS = -v -d -p "glcpp_parser_"
> AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
> 
>-include ../Makefile.sources
>-
> noinst_PROGRAMS = builtin_compiler
> 
> builtin_compiler_SOURCES = \
>@@ -51,7 +52,7 @@ builtin_compiler_SOURCES = \
> 	$(GLSL_SRCDIR)/glcpp/glcpp-parse.y \
> 	$(LIBGLCPP_FILES) \
> 	$(GLSL_SRCDIR)/glsl_lexer.ll \
>-	$(GLSL_SRCDIR)/glsl_parser.cc \
>+	$(GLSL_BUILDDIR)/glsl_parser.cc \
> 	$(LIBGLSL_FILES) \
> 	$(LIBGLSL_CXX_FILES) \
> 	$(top_srcdir)/src/mesa/program/hash_table.c \
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 56685: 69491 | 69667

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.