From 9dcbac82c8618e5f77d2295f3bc71f8be9fcbad6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 6 Jul 2023 07:56:20 -0700
Subject: bpftrace: Upgrade to 0.18.0

Allow clang/llvm 17 to build it

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-cmake-Raise-max-llvm-major-version-to-16.patch |  4 +-
 .../recipes-devtools/bpftrace/bpftrace_0.17.0.bb   | 60 ----------------------
 .../recipes-devtools/bpftrace/bpftrace_0.18.0.bb   | 60 ++++++++++++++++++++++
 3 files changed, 62 insertions(+), 62 deletions(-)
 delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.17.0.bb
 create mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.18.0.bb

(limited to 'dynamic-layers')

diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-cmake-Raise-max-llvm-major-version-to-16.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-cmake-Raise-max-llvm-major-version-to-16.patch
index 93fceb2..1806fde 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-cmake-Raise-max-llvm-major-version-to-16.patch
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-cmake-Raise-max-llvm-major-version-to-16.patch
@@ -15,8 +15,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
    endif()
  
    set(MIN_LLVM_MAJOR 6)
--  set(MAX_LLVM_MAJOR 15)
-+  set(MAX_LLVM_MAJOR 16)
+-  set(MAX_LLVM_MAJOR 16)
++  set(MAX_LLVM_MAJOR 17)
  
    if((${LLVM_VERSION_MAJOR} VERSION_LESS ${MIN_LLVM_MAJOR}) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER ${MAX_LLVM_MAJOR}))
      message(SEND_ERROR "Unsupported LLVM version found via ${LLVM_INCLUDE_DIRS}: ${LLVM_VERSION_MAJOR}")
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.17.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.17.0.bb
deleted file mode 100644
index f3405cb..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.17.0.bb
+++ /dev/null
@@ -1,60 +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 \
-            systemtap \
-            libcereal \
-            libbpf \
-            "
-
-PV .= "+git${SRCREV}"
-RDEPENDS:${PN} += "bash python3 xz"
-
-SRC_URI = "git://github.com/iovisor/bpftrace;branch=master;protocol=https \
-           file://0001-cmake-Raise-max-llvm-major-version-to-16.patch \
-           file://run-ptest \
-"
-SRCREV = "70ee22cb14e2eedc5df17e53965824d7381f8e6f"
-
-S = "${WORKDIR}/git"
-
-inherit cmake ptest
-
-PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
-
-# Clang-15.x crashes compiling some usdt tests
-# see https://github.com/llvm/llvm-project/issues/58477
-PACKAGECONFIG:remove:riscv64 = "tests"
-
-PACKAGECONFIG[tests] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF,gtest xxd-native"
-
-do_install_ptest() {
-    if [ -e ${B}/tests/bpftrace_test ]; then
-        install -Dm 755 ${B}/tests/bpftrace_test ${D}${PTEST_PATH}/tests/bpftrace_test
-        cp -rf ${B}/tests/runtime ${D}${PTEST_PATH}/tests
-        cp -rf ${B}/tests/test* ${D}${PTEST_PATH}/tests
-    fi
-}
-
-def llvm_major_version(d):
-    pvsplit = d.getVar('LLVMVERSION').split('.')
-    return pvsplit[0]
-
-LLVM_MAJOR_VERSION = "${@llvm_major_version(d)}"
-
-EXTRA_OECMAKE = " \
-    -DCMAKE_ENABLE_EXPORTS=1 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLLVM_REQUESTED_VERSION=${LLVM_MAJOR_VERSION} \
-    -DUSE_SYSTEM_BPF_BCC=ON \
-    -DENABLE_MAN=OFF \
-"
-
-COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*|riscv64.*)-linux"
-COMPATIBLE_HOST:libc-musl = "null"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.18.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.18.0.bb
new file mode 100644
index 0000000..0d7261f
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.18.0.bb
@@ -0,0 +1,60 @@
+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 \
+            libbpf \
+            "
+
+PV .= "+git${SRCREV}"
+RDEPENDS:${PN} += "bash python3 xz"
+
+SRC_URI = "git://github.com/iovisor/bpftrace;branch=master;protocol=https \
+           file://0001-cmake-Raise-max-llvm-major-version-to-16.patch \
+           file://run-ptest \
+"
+SRCREV = "e199c7e73da84bff9fe744d1e3402c2b505aa5a2"
+
+S = "${WORKDIR}/git"
+
+inherit cmake ptest
+
+PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+
+# Clang-15.x crashes compiling some usdt tests
+# see https://github.com/llvm/llvm-project/issues/58477
+PACKAGECONFIG:remove:riscv64 = "tests"
+
+PACKAGECONFIG[tests] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF,gtest xxd-native"
+
+do_install_ptest() {
+    if [ -e ${B}/tests/bpftrace_test ]; then
+        install -Dm 755 ${B}/tests/bpftrace_test ${D}${PTEST_PATH}/tests/bpftrace_test
+        cp -rf ${B}/tests/runtime ${D}${PTEST_PATH}/tests
+        cp -rf ${B}/tests/test* ${D}${PTEST_PATH}/tests
+    fi
+}
+
+def llvm_major_version(d):
+    pvsplit = d.getVar('LLVMVERSION').split('.')
+    return pvsplit[0]
+
+LLVM_MAJOR_VERSION = "${@llvm_major_version(d)}"
+
+EXTRA_OECMAKE = " \
+    -DCMAKE_ENABLE_EXPORTS=1 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLLVM_REQUESTED_VERSION=${LLVM_MAJOR_VERSION} \
+    -DUSE_SYSTEM_BPF_BCC=ON \
+    -DENABLE_MAN=OFF \
+"
+
+COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*|riscv64.*)-linux"
+COMPATIBLE_HOST:libc-musl = "null"
-- 
cgit v1.2.3-54-g00ecf