MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

metrics-discovery: Fix build with clang

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Khem Raj 2019-10-09 13:39:43 -07:00 committed by Anuj Mittal
parent 1e5115528f
commit e74263dfd0
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch Normal file
View File

@ -0,0 +1,34 @@
From 8c11096a0e5cf980309692ae3e272108da5f2b4e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 9 Oct 2019 11:36:56 -0700
Subject: [PATCH] md_internal.h: Replace string.h with <string> C++ header API
This helps in compiling with libc++/Clang
Fixes
usr/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> > >'
: public integral_constant<bool, __is_empty(_Tp)> {};
^
Upstream-Status: Submitted [https://github.com/intel/metrics-discovery/pull/14]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
instrumentation/metrics_discovery/common/md_internal.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/instrumentation/metrics_discovery/common/md_internal.cpp b/instrumentation/metrics_discovery/common/md_internal.cpp
index f9571ac..0767e81 100644
--- a/instrumentation/metrics_discovery/common/md_internal.cpp
+++ b/instrumentation/metrics_discovery/common/md_internal.cpp
@@ -27,8 +27,8 @@
\*****************************************************************************/
#include "md_internal.h"
-#include <string.h>
#include <stdlib.h>
+#include <string>
#include <new>
#include <unordered_map>
--
2.23.0

4
recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb
View File

@ -9,7 +9,9 @@ inherit pkgconfig cmake
S = "${WORKDIR}/git"
SRCREV = "a495db4682b7318bc82b1cccfb17fafdf2e3a2ff"
SRC_URI = "git://github.com/intel/metrics-discovery.git"
SRC_URI = "git://github.com/intel/metrics-discovery.git \
file://0001-md_internal.h-Replace-string.h-with-string-C-header-.patch \
"
EXTRA_OECMAKE += "-DMD_PLATFORM=linux"
EXTRA_OECMAKE += "-DMD_LIBDRM_SRC=${STAGING_INCDIR}"