diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-02-21 14:47:41 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-02-21 13:54:06 +0000 |
commit | 4db78b54773e07e8ac919033fd3dae6e13dc5673 (patch) | |
tree | b2a4e6a04a89674fc25c03a9fc3397cacc35dae2 /meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch | |
parent | 0a77aaa46dce2bdd5be51d2de110eb11217ea1ec (diff) | |
download | meta-boot2qt-4db78b54773e07e8ac919033fd3dae6e13dc5673.tar.gz |
intel: update mesa to 17.0.2
Use recipes from pyro branch to update mesa to 17.0.2, which
has support for the Intel NUCs with Kaby Lake.
Task-number: QTAUTO-798
Change-Id: Ia2402c9acc57f1286b85d4e8eb53b17de7222d01
Reviewed-by: Nikolay Zamotaev <nzamotaev@luxoft.com>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch')
-rw-r--r-- | meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch b/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch new file mode 100644 index 0000000..d2d6755 --- /dev/null +++ b/meta-intel-extras/recipes/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 | ||