diff options
author | Ross Burton <ross.burton@intel.com> | 2019-02-06 16:15:19 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-02-06 08:19:13 -0800 |
commit | 7baf5c36360bb628f4421095b958225c7e6ab487 (patch) | |
tree | 558f02192ba2fed2de30848ff17cdb1713d4c807 /meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch | |
parent | f6e0ee746b633a2632980221d02ff704c524e7b4 (diff) | |
download | meta-openembedded-7baf5c36360bb628f4421095b958225c7e6ab487.tar.gz |
glmark2: update to current git
Remove two patches merged upstream. The other patch isn't required so can be
deleted.
Remove explicit --std=c++11 as the wscript adds --std=c++14 now.
Change PV to contain the full date just in case we want to update more than once
a month.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch')
-rw-r--r-- | meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch deleted file mode 100644 index cdf09faec..000000000 --- a/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 35e9f80518d666db5f9c62e8072ffbc307b4af4f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 26 Aug 2017 08:30:01 -0700 | ||
4 | Subject: [PATCH] Fix clang warnings | ||
5 | |||
6 | ../src/native-state-drm.cpp:334:20: error: cannot pass object of non-trivial type 'std::__cxx11::basic_string<char>' through variadic function; call will abort at runtime [-Wnon-pod-varargs] | ||
7 | dev_path); | ||
8 | ^ | ||
9 | 1 error generated. | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | src/native-state-drm.cpp | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp | ||
17 | index dc2b323..62566ee 100644 | ||
18 | --- a/src/native-state-drm.cpp | ||
19 | +++ b/src/native-state-drm.cpp | ||
20 | @@ -331,7 +331,7 @@ static int open_using_udev_scan() | ||
21 | if (!valid_fd(fd)) { | ||
22 | // %m is GLIBC specific... Maybe use strerror here... | ||
23 | Log::error("Tried to use '%s' but failed.\nReason : %m", | ||
24 | - dev_path); | ||
25 | + dev_path.c_str()); | ||
26 | } | ||
27 | else | ||
28 | Log::debug("Success!\n"); | ||
29 | -- | ||
30 | 2.14.1 | ||
31 | |||