bpftrace: Upgrade to 0.23.x branch

This is targetting clang-20 support.

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

3 files changed, 4 insertions, 31 deletions

diff --git a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-cmake-Bump-max-LLVM-version-to-19.patch b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-cmake-Bump-max-LLVM-version-to-19.patch
deleted file mode 100644
index 88dc60b..0000000
--- a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-cmake-Bump-max-LLVM-version-to-19.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 16186113346c268a0bb45424ba1c41768b7e94cf Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 16 Feb 2024 10:14:41 -0800
-Subject: [PATCH] cmake: Bump max LLVM version to 19
-
-Upstream-Status: Submitted [https://github.com/bpftrace/bpftrace/pull/3433]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: git/CMakeLists.txt
-===================================================================
---- git.orig/CMakeLists.txt
-+++ git/CMakeLists.txt
-@@ -152,7 +152,7 @@ else()
- endif()
- 
- set(MIN_LLVM_MAJOR 13)
--set(MAX_LLVM_MAJOR 18)
-+set(MAX_LLVM_MAJOR 19)
- 
- 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/meta-python/recipes-devtools/bpftrace/bpftrace/0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch
index 661dbca..4f0ebbf 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch
+++ b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch
@@ -10,11 +10,9 @@ Upstream-Status: Pending
  CMakeLists.txt | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2b60fa26..89bead59 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -100,16 +100,20 @@ include_directories(SYSTEM ${LIBCEREAL_INCLUDE_DIRS})
+@@ -100,16 +100,20 @@ include_directories(SYSTEM ${LIBCEREAL_I
  
  find_package(BISON REQUIRED)
  find_package(FLEX REQUIRED)
@@ -36,5 +34,5 @@ index 2b60fa26..89bead59 100644
 -flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
 +flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc COMPILE_FLAGS ${FLEX_FLAGS})
  add_flex_bison_dependency(flex_lexer bison_parser)
- add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+ add_library(parser STATIC ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
  target_compile_options(parser PRIVATE "-w")
diff --git a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.21.2.bb b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb
index 4c888e7..3dd2a5f 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.21.2.bb
+++ b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb
@@ -18,12 +18,11 @@ RDEPENDS:${PN} += "bash python3 xz"
 
 PV .= "+git"
 
-SRC_URI = "git://github.com/iovisor/bpftrace;branch=master;protocol=https \
+SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.23.x;protocol=https \
            file://run-ptest \
-           file://0001-cmake-Bump-max-LLVM-version-to-19.patch \
            file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \
 "
-SRCREV = "b2e255870ba010d4a7e4852bffcf1c567b016fd0"
+SRCREV = "339a2f571505616832379ca216627aceb0e5d0bb"
 
 S = "${WORKDIR}/git"