Attachment 69429 Details for Bug 56653 – build: Drop BUILTIN_COMPILER_* variables

[patch] build: Drop BUILTIN_COMPILER_* variables

0001-build-Drop-BUILTIN_COMPILER_-variables.patch (text/plain), 2.11 KB, created by Thierry Reding on 2012-11-02 11:49:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Reding

Created: 2012-11-02 11:49:31 UTC

Size: 2.11 KB

patch

obsolete

>From 20dda53634b3a04eac413c24135f3aa43b5c5a9a Mon Sep 17 00:00:00 2001
>From: Thierry Reding <thierry.reding@avionic-design.de>
>Date: Fri, 2 Nov 2012 12:42:35 +0100
>Subject: [PATCH] build: Drop BUILTIN_COMPILER_* variables
>
>The BUILTIN_COMPILER_CXX_FILES variable is unused and can be dropped.
>Files listed in BUILTIN_COMPILER_GENERATED_CXX_FILES are no longer
>generated for the builtin compiler but for the GLSL compiler. The
>variable is renamed to GLSL_COMPILER_GENERATED_CXX_FILES for
>consistency.
>
>Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
>---
> src/glsl/Makefile.sources       | 13 ++-----------
> src/mesa/libdricore/Makefile.am |  2 +-
> 2 files changed, 3 insertions(+), 12 deletions(-)
>
>diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
>index aafb53e..55d2dad 100644
>--- a/src/glsl/Makefile.sources
>+++ b/src/glsl/Makefile.sources
>@@ -93,20 +93,11 @@ GLSL_COMPILER_CXX_FILES = \
> 	$(GLSL_SRCDIR)/standalone_scaffolding.cpp \
> 	$(GLSL_SRCDIR)/main.cpp
> 
>-# builtin_compiler
>-#
>-# This is built before libglsl to generate builtin_funciton.cpp for libglsl.
>-# For this to work, a dummy version of builtin_function.cpp,
>-# builtin_stubs.cpp, is used.
>-
>-BUILTIN_COMPILER_CXX_FILES = \
>-	$(GLSL_SRCDIR)/builtin_stubs.cpp
>-
>-BUILTIN_COMPILER_GENERATED_CXX_FILES = \
>+GLSL_COMPILER_GENERATED_CXX_FILES = \
> 	$(GLSL_BUILDDIR)/glsl_lexer.cc \
> 	$(GLSL_BUILDDIR)/glsl_parser.cc
> 
> # libglsl generated sources
> LIBGLSL_GENERATED_CXX_FILES = \
>-	$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
>+	$(GLSL_COMPILER_GENERATED_CXX_FILES) \
> 	$(GLSL_BUILDDIR)/builtin_function.cpp
>diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
>index efd836e..490f7f3 100644
>--- a/src/mesa/libdricore/Makefile.am
>+++ b/src/mesa/libdricore/Makefile.am
>@@ -40,7 +40,7 @@ libdricore@VERSION@_la_SOURCES = \
> 	$(LIBGLCPP_FILES) \
> 	$(LIBGLSL_FILES) \
> 	$(LIBGLSL_CXX_FILES) \
>-	$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
>+	$(GLSL_COMPILER_GENERATED_CXX_FILES) \
> 	$(top_builddir)/src/glsl/builtin_function.cpp
> libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
> libdricore@VERSION@_la_LIBADD = libdricore-asm.la
>-- 
>1.8.0
>

Actions: View | Splinter Review

Attachments on bug 56653: 69412 | 69427 | 69429

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.