From 06d032fd13a0ab3c83305abdafad45b8ef006129 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 5 Aug 2021 08:02:09 -0700 Subject: 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 --- .../0001-bpforc.h-Include-optional-header.patch | 31 ------------------- .../0001-support-clang-upto-version-13.patch | 27 ++++++++++++++++ .../recipes-devtools/bpftrace/bpftrace_0.11.4.bb | 32 ------------------- .../recipes-devtools/bpftrace/bpftrace_0.13.0.bb | 36 ++++++++++++++++++++++ 4 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-bpforc.h-Include-optional-header.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-support-clang-upto-version-13.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.13.0.bb (limited to 'dynamic-layers') 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 -Date: Tue, 30 Mar 2021 17:25:10 -0700 -Subject: [PATCH] bpforc.h: Include header - -This is required since this header had std::optional> - -Fixes buiild errors with clang-12 with gcc11-runtime - -Upstream-Status: Submitted [https://github.com/iovisor/bpftrace/pull/1762] -Signed-off-by: Khem Raj ---- - 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 - #endif - -+#include -+ - 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 +Date: Thu, 5 Aug 2021 22:15:27 -0700 +Subject: [PATCH] support clang upto version 13 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + 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=") + 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.11.4.bb deleted file mode 100644 index 9f67d94..0000000 --- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "bpftrace" -HOMEPAGE = "https://github.com/iovisor/bpftrace" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS += "bison-native \ - flex-native \ - gzip-native \ - elfutils \ - bcc \ - " - -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 \ - " -SRCREV = "6bfa61f505b6b4215328f90762776edd8a22fdb7" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = " \ - -DCMAKE_ENABLE_EXPORTS=1 \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTING=OFF \ -" - -COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*)-linux" -COMPATIBLE_HOST:libc-musl = "null" 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 new file mode 100644 index 0000000..83e4722 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.13.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "bpftrace" +HOMEPAGE = "https://github.com/iovisor/bpftrace" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS += "bison-native \ + flex-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-support-clang-upto-version-13.patch \ + " +SRCREV = "18aa073ee86260878bc76227a5023171f6c29200" + +S = "${WORKDIR}/git" + +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" +COMPATIBLE_HOST:libc-musl = "null" -- cgit v1.2.3-54-g00ecf