Andy Hu
7566503cc1
upgrade the mesa3d and mesa3d-headers to v22.1.3 and copy patch from IMG DDK 1.19 keep the 0002-Force-Mesa-to-use-the-PVR-driver-for-platform-device.patch to force the pvr driver Note that the new version mesa3d support gallium driver and no longer support dri driver Signed-off-by: Andy Hu <andy.hu@starfivetech.com> Signed-off-by: Windsome Zeng <Windsome.Zeng@starfivetech.com>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 7cfdab7b8a2e122821ec3086e6a5e1d35a0c88a0 Mon Sep 17 00:00:00 2001
|
|
From: Brendan King <Brendan.King@imgtec.com>
|
|
Date: Mon, 24 Jun 2019 09:35:39 +0100
|
|
Subject: [PATCH 30/58] meson: force C++ 2011 for "thread_local"
|
|
|
|
For some combinations of Meson and the GNU C++ compiler, Meson does
|
|
not add '-std=c++11' to the command line arguments, resulting in
|
|
compilation errors, due to the use of the "thread_local" keyword (a
|
|
C++ 2011 feature). If the C++ compiler doesn't understand the
|
|
"thread_local" keyword by default, add '-std=c++11' to the compiler
|
|
command line arguments.
|
|
---
|
|
meson.build | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index ce81c7d0f9e..b4d5b849f8b 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -41,6 +41,12 @@ endif
|
|
cc = meson.get_compiler('c')
|
|
cpp = meson.get_compiler('cpp')
|
|
|
|
+if not cpp.compiles('thread_local int x = 0;', name : 'thread_local')
|
|
+ if cpp.has_argument('-std=c++11')
|
|
+ add_project_arguments('-std=c++11', language : 'cpp')
|
|
+ endif
|
|
+endif
|
|
+
|
|
null_dep = dependency('', required : false)
|
|
|
|
if get_option('layout') != 'mirror'
|
|
--
|
|
2.25.1
|
|
|