diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-08-26 11:35:18 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 10:18:32 +0200 |
commit | ff77141b96a73fb79b72ab7879008621dc92dc1a (patch) | |
tree | 3a144ea3f0c15de5108a72c2a086c502af504ed7 /meta-oe/recipes-benchmark | |
parent | fd9b6aa1d3f07b8986c8d3a56b85076f204bba8c (diff) | |
download | meta-openembedded-ff77141b96a73fb79b72ab7879008621dc92dc1a.tar.gz |
glmark2: Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark')
-rw-r--r-- | meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 9 |
2 files changed, 36 insertions, 4 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 new file mode 100644 index 000000000..cdf09faec --- /dev/null +++ b/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch | |||
@@ -0,0 +1,31 @@ | |||
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 | |||
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 4c5e0567b..d3766d916 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | |||
@@ -15,10 +15,11 @@ PV = "2017.07+${SRCPV}" | |||
15 | COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" | 15 | COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ | 17 | SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ |
18 | file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ | 18 | file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ |
19 | file://Fix-configure-for-sqrt-check.patch \ | 19 | file://Fix-configure-for-sqrt-check.patch \ |
20 | " | 20 | file://0001-Fix-clang-warnings.patch \ |
21 | SRCREV = "182dcbffe5c8483eadff025b429ee1aacc69c6c2" | 21 | " |
22 | SRCREV = "ed20c633f1926d1dd78e3e89043c85a81302cbe6" | ||
22 | 23 | ||
23 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |
24 | 25 | ||