Attachment 69491 Details for Bug 56685 – Possible fix

[patch] Possible fix

0001-glsl-builtin_compiler-Makefile.am-Add-I-GLSL_BUILDDI.patch (text/plain), 1.35 KB, created by Johannes Obermayr on 2012-11-03 16:12:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Obermayr

Created: 2012-11-03 16:12:52 UTC

Size: 1.35 KB

patch

obsolete

>From 5aefe6b6be5569be5fb5fc3d53f0d63a6a507bfe Mon Sep 17 00:00:00 2001
>From: Johannes Obermayr <johannesobermayr@gmx.de>
>Date: Sat, 3 Nov 2012 17:00:46 +0100
>Subject: [PATCH] glsl/builtin_compiler/Makefile.am: Add -I $(GLSL_BUILDDIR)
> to AM_CFLAGS.
>
>Also 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 |    5 +++--
> 1 Datei geÃ¤ndert, 3 Zeilen hinzugefÃ¼gt(+), 2 Zeilen entfernt(-)
>
>diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
>index 72032b5..1ede012 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 = \
>-- 
>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.