diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch b/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch new file mode 100644 index 0000000000..460a2748bf --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch | |||
| @@ -0,0 +1,54 @@ | |||
| 1 | From ab38c97f057f739533a4e1fc9de51ea5f4e6242d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jonathan Liu <net147@gmail.com> | ||
| 3 | Date: Sat, 29 Jun 2013 11:37:20 +0200 | ||
| 4 | Subject: [PATCH 4/4] glsl: fix builtin_compiler cross-compilation | ||
| 5 | |||
| 6 | The target libtool is used when building host binaries, which predictably | ||
| 7 | doesn't work. | ||
| 8 | |||
| 9 | Upstream-Status: Submitted https://bugs.freedesktop.org/show_bug.cgi?id=44618 | ||
| 10 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
| 11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 12 | --- | ||
| 13 | src/glsl/builtin_compiler/Makefile.am | 13 +++++++++++++ | ||
| 14 | 1 file changed, 13 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am | ||
| 17 | index e11a17f..8ebe0a2 100644 | ||
| 18 | --- a/src/glsl/builtin_compiler/Makefile.am | ||
| 19 | +++ b/src/glsl/builtin_compiler/Makefile.am | ||
| 20 | @@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS) | ||
| 21 | include ../Makefile.sources | ||
| 22 | |||
| 23 | noinst_PROGRAMS = builtin_compiler | ||
| 24 | + | ||
| 25 | +if !CROSS_COMPILING | ||
| 26 | noinst_LTLIBRARIES = libglslcore.la libglcpp.la | ||
| 27 | |||
| 28 | libglcpp_la_SOURCES = \ | ||
| 29 | @@ -73,6 +75,7 @@ libglcpp_la_SOURCES = \ | ||
| 30 | libglslcore_la_SOURCES = \ | ||
| 31 | $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ | ||
| 32 | $(LIBGLSL_FILES) | ||
| 33 | +endif | ||
| 34 | |||
| 35 | builtin_compiler_SOURCES = \ | ||
| 36 | $(top_srcdir)/src/mesa/main/hash_table.c \ | ||
| 37 | @@ -81,4 +84,14 @@ builtin_compiler_SOURCES = \ | ||
| 38 | $(top_srcdir)/src/mesa/program/symbol_table.c \ | ||
| 39 | $(BUILTIN_COMPILER_CXX_FILES) \ | ||
| 40 | $(GLSL_COMPILER_CXX_FILES) | ||
| 41 | + | ||
| 42 | +if CROSS_COMPILING | ||
| 43 | +builtin_compiler_SOURCES += \ | ||
| 44 | + $(LIBGLCPP_GENERATED_FILES) \ | ||
| 45 | + $(LIBGLCPP_FILES) \ | ||
| 46 | + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ | ||
| 47 | + $(LIBGLSL_FILES) | ||
| 48 | +builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS) | ||
| 49 | +else | ||
| 50 | builtin_compiler_LDADD = libglslcore.la libglcpp.la | ||
| 51 | +endif | ||
| 52 | -- | ||
| 53 | 1.8.2.1 | ||
| 54 | |||