Attachment 79975 Details for Bug 44618 – Patch

[patch] Patch

mesa-cross-compile.patch (text/plain), 1.07 KB, created by Jonathan Liu on 2013-05-29 15:22:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Liu

Created: 2013-05-29 15:22:51 UTC

Size: 1.07 KB

patch

obsolete

>diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
>index e11a17f..8ebe0a2 100644
>--- a/src/glsl/builtin_compiler/Makefile.am
>+++ b/src/glsl/builtin_compiler/Makefile.am
>@@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS)
> include ../Makefile.sources
> 
> noinst_PROGRAMS = builtin_compiler
>+
>+if !CROSS_COMPILING
> noinst_LTLIBRARIES = libglslcore.la libglcpp.la
> 
> libglcpp_la_SOURCES =					\
>@@ -73,6 +75,7 @@ libglcpp_la_SOURCES =					\
> libglslcore_la_SOURCES =				\
> 	$(BUILTIN_COMPILER_GENERATED_CXX_FILES)		\
> 	$(LIBGLSL_FILES)
>+endif
> 
> builtin_compiler_SOURCES = \
> 	$(top_srcdir)/src/mesa/main/hash_table.c	\
>@@ -81,4 +84,14 @@ builtin_compiler_SOURCES = \
> 	$(top_srcdir)/src/mesa/program/symbol_table.c	\
> 	$(BUILTIN_COMPILER_CXX_FILES)			\
> 	$(GLSL_COMPILER_CXX_FILES)
>+
>+if CROSS_COMPILING
>+builtin_compiler_SOURCES += \
>+	$(LIBGLCPP_GENERATED_FILES) \
>+	$(LIBGLCPP_FILES) \
>+	$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
>+	$(LIBGLSL_FILES)
>+builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS)
>+else
> builtin_compiler_LDADD = libglslcore.la libglcpp.la
>+endif

Actions: View | Splinter Review

Attachments on bug 44618: 55540 | 67142 | 77156 | 79975

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.