diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-07-29 21:50:46 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-04 15:22:21 +0100 |
commit | d4040da8bc23e6c289cc8f2ca6d43deb06acf7d6 (patch) | |
tree | 8839ad18670bd33550379f04f9517e7bb3e44ec8 /meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch | |
parent | 50008ffeb95901a430160003c5823676b52615a6 (diff) | |
download | poky-d4040da8bc23e6c289cc8f2ca6d43deb06acf7d6.tar.gz |
mesa: Fix build when cross compiling with clang
(From OE-Core rev: 69e9b190ff0e8b963bbaea8365917218cf3c2558)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch b/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch new file mode 100644 index 0000000000..d2d67558b6 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Configure checks for compiler to be gcc and then it enables asm_offsets | ||
2 | generation. see | ||
3 | |||
4 | https://cgit.freedesktop.org/mesa/mesa/commit/?id=73c9b4b0e05fc66629ba250846948dc55c0e7a0d | ||
5 | |||
6 | However, we missed the check when enabling this on cross compilation | ||
7 | when architecture for both host and target is x86 | ||
8 | |||
9 | Fixes errors like | ||
10 | ./gen_matypes > matypes.h | ||
11 | /bin/bash: ./gen_matypes: No such file or directory | ||
12 | |||
13 | -Khem | ||
14 | |||
15 | Upstream-Status: Submitted | ||
16 | |||
17 | Index: mesa-12.0.1/configure.ac | ||
18 | =================================================================== | ||
19 | --- mesa-12.0.1.orig/configure.ac | ||
20 | +++ mesa-12.0.1/configure.ac | ||
21 | @@ -732,7 +732,7 @@ test "x$enable_asm" = xno && AC_MSG_RESU | ||
22 | if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then | ||
23 | case "$host_cpu" in | ||
24 | i?86 | x86_64 | amd64) | ||
25 | - if test "x$host_cpu" != "x$target_cpu"; then | ||
26 | + if test "x$host_cpu" != "x$target_cpu" -o "x$acv_mesa_CLANG" = xyes; then | ||
27 | enable_asm=no | ||
28 | AC_MSG_RESULT([no, cross compiling]) | ||
29 | fi | ||