2 files changed, 50 insertions, 0 deletions

diff --git a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch
new file mode 100644
index 0000000..0364d90
--- /dev/null
+++ b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch
@@ -0,0 +1,45 @@
+From 814d20901a71fd4d98a5a67789d69ef7e9a2169c Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Tue, 3 Sep 2024 13:47:48 +0200
+Subject: [PATCH] CMakeLists.txt: allow to set BISON_FLAGS like -l
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
+Upstream-Status: Pending
+
+Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
+---
+ CMakeLists.txt | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7d0433d..6b3d445 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -91,16 +91,20 @@ include_directories(SYSTEM ${LIBCEREAL_INCLUDE_DIRS})
+ 
+ find_package(BISON REQUIRED)
+ find_package(FLEX REQUIRED)
++
++# avoid buildpaths in generated #line statements and allow to pass --file-prefix-map=OLD=NEW
++set(BISON_FLAGS "${BISON_FLAGS} -l")
++set(FLEX_FLAGS "${FLEX_FLAGS} -L")
+ # `parser_class_name` is deprecated and generates warnings in bison >= 3.3.
+ # But `api.parser.class` is not supported in bison < 3.3. So we must inject
+ # the %define based on the bison version here.
+ if(${BISON_VERSION} VERSION_GREATER_EQUAL 3.3)
+-  set(BISON_FLAGS "-Dapi.parser.class={Parser}")
++  set(BISON_FLAGS "${BISON_FLAGS} -Dapi.parser.class={Parser}")
+ else()
+-  set(BISON_FLAGS "-Dparser_class_name={Parser}")
++  set(BISON_FLAGS "${BISON_FLAGS} -Dparser_class_name={Parser}")
+ endif()
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc COMPILE_FLAGS ${BISON_FLAGS} VERBOSE)
+-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})
+ target_compile_options(parser PRIVATE "-w")
+-- 
+2.40.0
+
diff --git a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.20.1.bb b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.20.1.bb
index 355f427..f0c29f4 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.20.1.bb
+++ b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.20.1.bb
@@ -25,6 +25,7 @@ SRC_URI = "git://github.com/iovisor/bpftrace;branch=master;protocol=https \
            file://0004-cmake-Bump-max-LLVM-version-to-18.patch \
            file://0001-use-64bit-alignment-for-map-counter-atomic-add.patch \
            file://run-ptest \
+           file://0001-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \
 "
 SRCREV = "fe6362b4e2c1b9d0833c7d3f308c1d4006b54723"
 
@@ -55,6 +56,7 @@ EXTRA_OECMAKE = " \
     -DCMAKE_BUILD_TYPE=Release \
     -DUSE_SYSTEM_BPF_BCC=ON \
     -DENABLE_MAN=OFF \
+    -DBISON_FLAGS='--file-prefix-map=${WORKDIR}=' \
 "
 
 COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*|riscv64.*)-linux"
@@ -63,3 +65,6 @@ COMPATIBLE_HOST:libc-musl = "null"
 INHIBIT_PACKAGE_STRIP_FILES += "\
     ${PKGD}${PTEST_PATH}/tests/testprogs/uprobe_test \
 "
+
+WARN_QA:append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' buildpaths', '', d)}"
+ERROR_QA:remove = "${@bb.utils.contains('PTEST_ENABLED', '1', 'buildpaths', '', d)}"