Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa
Commits:
-
61381ad6
by Frédéric Bonnard at 2020-05-07T12:04:58+02:00
2 changed files:
Changes:
| 1 |
+Description: Fix FTBFS on ppc64el
|
|
| 2 |
+gnu++11 used to let mesa compile on ppc64el but with the use of C++14
|
|
| 3 |
+compilation now fails.
|
|
| 4 |
+Let's not force gnu++11 and use defaults like on other arches but
|
|
| 5 |
+fix the issue that happens then, that is, the collision of altivec and
|
|
| 6 |
+c++ symbols.
|
|
| 7 |
+For that we undefine bool, vector, pixel as advised by altivec.h .
|
|
| 8 |
+Author: Frédéric Bonnard <frediz@debian.org>
|
|
| 9 |
+---
|
|
| 10 |
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
|
| 11 |
+--- a/meson.build
|
|
| 12 |
++++ b/meson.build
|
|
| 13 |
+@@ -724,14 +724,6 @@
|
|
| 14 |
+ dep_spirv_tools = null_dep
|
|
| 15 |
+ dep_llvmspirvlib = null_dep
|
|
| 16 |
+ endif
|
|
| 17 |
+-
|
|
| 18 |
+- if host_machine.cpu_family().startswith('ppc') and cpp.compiles('''
|
|
| 19 |
+- #if !defined(__VEC__) || !defined(__ALTIVEC__)
|
|
| 20 |
+- #error "AltiVec not enabled"
|
|
| 21 |
+- #endif''',
|
|
| 22 |
+- name : 'Altivec')
|
|
| 23 |
+- clover_cpp_std += ['cpp_std=gnu++11']
|
|
| 24 |
+- endif
|
|
| 25 |
+ else
|
|
| 26 |
+ dep_clc = null_dep
|
|
| 27 |
+ dep_spirv_tools = null_dep
|
|
| 28 |
+--- a/include/CL/cl_platform.h
|
|
| 29 |
++++ b/include/CL/cl_platform.h
|
|
| 30 |
+@@ -356,6 +356,11 @@
|
|
| 31 |
+ /* Define basic vector types */
|
|
| 32 |
+ #if defined( __VEC__ )
|
|
| 33 |
+ #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
|
|
| 34 |
++ #if defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__)
|
|
| 35 |
++ #undef vector
|
|
| 36 |
++ #undef pixel
|
|
| 37 |
++ #undef bool
|
|
| 38 |
++ #endif
|
|
| 39 |
+ typedef __vector unsigned char __cl_uchar16;
|
|
| 40 |
+ typedef __vector signed char __cl_char16;
|
|
| 41 |
+ typedef __vector unsigned short __cl_ushort8;
|
| ... | ... | @@ -2,3 +2,4 @@ |
| 2 | 2 |
fix-python-shebang.diff
|
| 3 | 3 |
path_max.diff
|
| 4 | 4 |
fix-build-with-llvm-10.diff
|
| 5 |
+fix-ppc64el.patch
|