bpftrace: Upgrade to 0.13.0

Drop already upstreamed patch
Fix build with clang 13
Add missing dependencies on systemtap and libcereal

Signed-off-by: Khem Raj <raj.khem@gmail.com>

3 files changed, 33 insertions, 33 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-bpforc.h-Include-optional-header.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-bpforc.h-Include-optional-header.patch
deleted file mode 100644
index c666bfe..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-bpforc.h-Include-optional-header.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ec41ce71f8cd318ab3ca4ce727e7398289b5d7cf Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 30 Mar 2021 17:25:10 -0700
-Subject: [PATCH] bpforc.h: Include <optional> header
-
-This is required since this header had std::optional<std::tuple<uint8_t *, uintptr_t>>
-
-Fixes buiild errors with clang-12 with gcc11-runtime
-
-Upstream-Status: Submitted [https://github.com/iovisor/bpftrace/pull/1762]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/bpforc.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/bpforc.h b/src/bpforc.h
-index da6345be..5634c544 100644
---- a/src/bpforc.h
-+++ b/src/bpforc.h
-@@ -22,6 +22,8 @@
- #include <llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h>
- #endif
- 
-+#include <optional>
-+
- namespace bpftrace {
- 
- const std::string LLVMTargetTriple = "bpf-pc-linux";
--- 
-2.31.1
-
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-support-clang-upto-version-13.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-support-clang-upto-version-13.patch
new file mode 100644
index 0000000..2272635
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-support-clang-upto-version-13.patch
@@ -0,0 +1,27 @@
+From 4cffb745dabde63f6f9c67a95265f5fc670dc1d7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 5 Aug 2021 22:15:27 -0700
+Subject: [PATCH] support clang upto version 13
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 86daa195..73744207 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -162,7 +162,7 @@ else()
+     find_package(LLVM REQUIRED)
+   endif()
+ 
+-  if((${LLVM_VERSION_MAJOR} VERSION_LESS 6) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER 12))
++  if((${LLVM_VERSION_MAJOR} VERSION_LESS 6) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER 13))
+     message(SEND_ERROR "Unsupported LLVM version found: ${LLVM_INCLUDE_DIRS}")
+     message(SEND_ERROR "Specify an LLVM major version using LLVM_REQUESTED_VERSION=<major version>")
+   endif()
+-- 
+2.32.0
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.13.0.bb
index 9f67d94..83e4722 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.13.0.bb
@@ -8,15 +8,17 @@ DEPENDS += "bison-native \
             gzip-native \
             elfutils \
             bcc \
+            systemtap \
+            libcereal \
             "
 
 PV .= "+git${SRCREV}"
 RDEPENDS:${PN} += "bash python3 xz"
 
 SRC_URI = "git://github.com/iovisor/bpftrace;branch=master \
-           file://0001-bpforc.h-Include-optional-header.patch \
+           file://0001-support-clang-upto-version-13.patch \
            "
-SRCREV = "6bfa61f505b6b4215328f90762776edd8a22fdb7"
+SRCREV = "18aa073ee86260878bc76227a5023171f6c29200"
 
 S = "${WORKDIR}/git"
 
@@ -25,7 +27,9 @@ inherit cmake
 EXTRA_OECMAKE = " \
     -DCMAKE_ENABLE_EXPORTS=1 \
     -DCMAKE_BUILD_TYPE=Release \
+    -DLLVM_REQUESTED_VERSION=13 \
     -DBUILD_TESTING=OFF \
+    -DENABLE_MAN=OFF \
 "
 
 COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*)-linux"