summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-10-09 20:39:43 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2019-10-10 04:16:22 (GMT)
commite74263dfd06d4caf55d8a366e2ec7327550cab1d (patch)
tree4566adc2f0d3bfabc76f169d37897e1667702bb4
parent1e5115528fb9ca11a8dfa9b9a42b9b4ccae55f28 (diff)
downloadmeta-intel-e74263dfd06d4caf55d8a366e2ec7327550cab1d.tar.gz
metrics-discovery: Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch34
-rw-r--r--recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb4
2 files changed, 37 insertions, 1 deletions
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch b/recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch
new file mode 100644
index 0000000..d97c654
--- /dev/null
+++ b/recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch
@@ -0,0 +1,34 @@
1From 8c11096a0e5cf980309692ae3e272108da5f2b4e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 Oct 2019 11:36:56 -0700
4Subject: [PATCH] md_internal.h: Replace string.h with <string> C++ header API
5
6This helps in compiling with libc++/Clang
7Fixes
8usr/include/c++/v1/type_traits:1561:38: error: implicit instantiation of undefined template 'std::__1::hash<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >'
9: public integral_constant<bool, __is_empty(_Tp)> {};
10^
11
12Upstream-Status: Submitted [https://github.com/intel/metrics-discovery/pull/14]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 instrumentation/metrics_discovery/common/md_internal.cpp | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/instrumentation/metrics_discovery/common/md_internal.cpp b/instrumentation/metrics_discovery/common/md_internal.cpp
19index f9571ac..0767e81 100644
20--- a/instrumentation/metrics_discovery/common/md_internal.cpp
21+++ b/instrumentation/metrics_discovery/common/md_internal.cpp
22@@ -27,8 +27,8 @@
23 \*****************************************************************************/
24 #include "md_internal.h"
25
26-#include <string.h>
27 #include <stdlib.h>
28+#include <string>
29 #include <new>
30 #include <unordered_map>
31
32--
332.23.0
34
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb
index 6267718..da7cb65 100644
--- a/recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb
+++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb
@@ -9,7 +9,9 @@ inherit pkgconfig cmake
9 9
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
11SRCREV = "a495db4682b7318bc82b1cccfb17fafdf2e3a2ff" 11SRCREV = "a495db4682b7318bc82b1cccfb17fafdf2e3a2ff"
12SRC_URI = "git://github.com/intel/metrics-discovery.git" 12SRC_URI = "git://github.com/intel/metrics-discovery.git \
13 file://0001-md_internal.h-Replace-string.h-with-string-C-header-.patch \
14 "
13 15
14EXTRA_OECMAKE += "-DMD_PLATFORM=linux" 16EXTRA_OECMAKE += "-DMD_PLATFORM=linux"
15EXTRA_OECMAKE += "-DMD_LIBDRM_SRC=${STAGING_INCDIR}" 17EXTRA_OECMAKE += "-DMD_LIBDRM_SRC=${STAGING_INCDIR}"