diff options
| author | Yogesh Tyagi <yogesh.tyagi@intel.com> | 2022-11-08 12:44:38 +0800 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2022-11-08 15:04:26 +0800 |
| commit | b74ec77719d9086384ae45ed8db05d4f4abcfe35 (patch) | |
| tree | 8b83fdafda524e2ee1e5e9a64ef0a9e311e09c46 | |
| parent | a09b3264fcc75b7ba26d13654bbf4880c26ff823 (diff) | |
| download | meta-intel-b74ec77719d9086384ae45ed8db05d4f4abcfe35.tar.gz | |
metrics-discovery : upgrade 1.5.108 -> 1.12.158
Drops patch already merged:
0001-md_internal.h-Replace-string.h-with-string-C-header-.patch
Release Notes:
https://github.com/intel/metrics-discovery/releases/tag/metrics-discovery-1.12.158
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.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-.patch | 34 | ||||
| -rw-r--r-- | recipes-graphics/metrics-discovery/metrics-discovery_1.12.158.bb (renamed from recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb) | 3 |
2 files changed, 1 insertions, 36 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 deleted file mode 100644 index d97c6543..00000000 --- a/recipes-graphics/metrics-discovery/metrics-discovery/0001-md_internal.h-Replace-string.h-with-string-C-header-.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From 8c11096a0e5cf980309692ae3e272108da5f2b4e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 9 Oct 2019 11:36:56 -0700 | ||
| 4 | Subject: [PATCH] md_internal.h: Replace string.h with <string> C++ header API | ||
| 5 | |||
| 6 | This helps in compiling with libc++/Clang | ||
| 7 | Fixes | ||
| 8 | 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> > >' | ||
| 9 | : public integral_constant<bool, __is_empty(_Tp)> {}; | ||
| 10 | ^ | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/intel/metrics-discovery/pull/14] | ||
| 13 | Signed-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 | |||
| 18 | diff --git a/instrumentation/metrics_discovery/common/md_internal.cpp b/instrumentation/metrics_discovery/common/md_internal.cpp | ||
| 19 | index 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 | -- | ||
| 33 | 2.23.0 | ||
| 34 | |||
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.158.bb index dd6dc1d5..30b9d7be 100644 --- a/recipes-graphics/metrics-discovery/metrics-discovery_1.5.108.bb +++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.158.bb | |||
| @@ -8,9 +8,8 @@ SECTION = "lib" | |||
| 8 | inherit pkgconfig cmake | 8 | inherit pkgconfig cmake |
| 9 | 9 | ||
| 10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
| 11 | SRCREV = "a495db4682b7318bc82b1cccfb17fafdf2e3a2ff" | 11 | SRCREV = "24a1726b50aae8bb689381b9c293a617f4d7b0da" |
| 12 | SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \ | 12 | SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \ |
| 13 | file://0001-md_internal.h-Replace-string.h-with-string-C-header-.patch \ | ||
| 14 | " | 13 | " |
| 15 | 14 | ||
| 16 | EXTRA_OECMAKE += "-DMD_PLATFORM=linux" | 15 | EXTRA_OECMAKE += "-DMD_PLATFORM=linux" |
