From 46b8d34025d187ce093fcde4210768e2395a5fa4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 4 Sep 2021 12:16:44 -0700
Subject: bpftrace: Upgrade to latest on trunk

Drop upstreamed patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-ast-Add-missing-standard-header-includes.patch | 49 ----------------------
 .../recipes-devtools/bpftrace/bpftrace_0.13.0.bb   |  3 +-
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0002-ast-Add-missing-standard-header-includes.patch

(limited to 'dynamic-layers')

diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0002-ast-Add-missing-standard-header-includes.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0002-ast-Add-missing-standard-header-includes.patch
deleted file mode 100644
index 2d1d0ac..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0002-ast-Add-missing-standard-header-includes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 891071a52e2d5e62634bd6cff249f0d7346e66fa Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 6 Aug 2021 20:14:06 -0700
-Subject: [PATCH 2/2] ast: Add missing standard header includes
-
-This fixes build when using libc++ from clang 13
-Fixes
-src/bpforc.h:40:10: error: no template named 'unordered_map' in nam
-espace 'std'
-|     std::unordered_map<std::string, std::tuple<uint8_t *, uintptr_t>>;
-
-src/ast/vtable.h:76:30: error: implicit instantiation of undefined
-template 'std::basic_string<char>'
-|     throw std::runtime_error(std::string("Unknown node: ") + typeid(n).name());
-|                              ^
-
-Upstream-Status: Submitted [https://github.com/iovisor/bpftrace/pull/1962]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/ast/bpforc/bpforc.h | 1 +
- src/ast/vtable.h        | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/ast/bpforc/bpforc.h b/src/ast/bpforc/bpforc.h
-index de0ed0c0..1b929dfd 100644
---- a/src/ast/bpforc/bpforc.h
-+++ b/src/ast/bpforc/bpforc.h
-@@ -23,6 +23,7 @@
- #endif
-
- #include <optional>
-+#include <unordered_map>
-
- namespace bpftrace {
-
-diff --git a/src/ast/vtable.h b/src/ast/vtable.h
-index 49e0f512..b89e6979 100644
---- a/src/ast/vtable.h
-+++ b/src/ast/vtable.h
-@@ -4,6 +4,7 @@
- #include <typeindex>
- #include <typeinfo>
- #include <unordered_map>
-+#include <string>
-
- namespace bpftrace {
- namespace ast {
---
-2.32.0
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.13.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.13.0.bb
index 006ca21..952a66f 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.13.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.13.0.bb
@@ -18,9 +18,8 @@ RDEPENDS:${PN} += "bash python3 xz"
 
 SRC_URI = "git://github.com/iovisor/bpftrace;branch=master \
            file://0001-support-clang-upto-version-13.patch \
-           file://0002-ast-Add-missing-standard-header-includes.patch \
            "
-SRCREV = "24e1ca2f55591d2d284e0e80b77a22efd790e942"
+SRCREV = "283fe526dfc262fdecddec4beb921835ea0cc89e"
 
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3-54-g00ecf