diff options
| author | Khem Raj <raj.khem@gmail.com> | 2025-08-31 00:48:53 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-09-07 12:33:27 -0700 |
| commit | c415680160f55480b3c1675bbaf0836e6b652489 (patch) | |
| tree | 8eed9164fc7cc7ee8055d2a71ad57245701fbb18 /meta-oe/dynamic-layers/meta-python | |
| parent | 09387c691b201dc4fcb20176490c76dcc8fa95cd (diff) | |
| download | meta-openembedded-c415680160f55480b3c1675bbaf0836e6b652489.tar.gz | |
bpftrace: Upgrade to 0.23.5 release
Drop backported patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/dynamic-layers/meta-python')
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch | 54 | ||||
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.5.bb (renamed from meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb) | 5 |
2 files changed, 1 insertions, 58 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch deleted file mode 100644 index 1c2ae33238..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | From 24421ba92c69f1abaadaff01270621917616a2b8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Thu, 17 Apr 2025 10:38:50 +0800 | ||
| 4 | Subject: [PATCH] Fix build failures due to missing location.hh | ||
| 5 | |||
| 6 | ast/location.h does `#include "location.hh"` and location.hh is | ||
| 7 | generated by the parser so any CMake target whose source includes | ||
| 8 | ast/location.h needs to have a dependency on the `parser` target, | ||
| 9 | otherwise the compilation may fail due to incorrect ordering of build | ||
| 10 | targets. This also applies to targets which include ast/location.h | ||
| 11 | transitively via other headers. | ||
| 12 | |||
| 13 | To avoid such errors, do 2 things: | ||
| 14 | - drop includes of ast/location.h where unused | ||
| 15 | - for CMake targets including ast/location.h, add an explicit dependency | ||
| 16 | on the `parser` target | ||
| 17 | |||
| 18 | Signed-off-by: Viktor Malik <viktor.malik@gmail.com> | ||
| 19 | |||
| 20 | Upstream-Status: Backport [https://github.com/bpftrace/bpftrace/commit/743cb9c88c25fb9737d714f4d4ac853f05bb6481] | ||
| 21 | |||
| 22 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 23 | --- | ||
| 24 | src/CMakeLists.txt | 1 + | ||
| 25 | src/ast/CMakeLists.txt | 1 + | ||
| 26 | 2 files changed, 2 insertions(+) | ||
| 27 | |||
| 28 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
| 29 | index e04ee429..13a51040 100644 | ||
| 30 | --- a/src/CMakeLists.txt | ||
| 31 | +++ b/src/CMakeLists.txt | ||
| 32 | @@ -21,6 +21,7 @@ add_library(compiler_core STATIC | ||
| 33 | struct.cpp | ||
| 34 | types.cpp | ||
| 35 | ) | ||
| 36 | +add_dependencies(compiler_core parser) | ||
| 37 | |||
| 38 | add_library(runtime STATIC | ||
| 39 | attached_probe.cpp | ||
| 40 | diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt | ||
| 41 | index 92231f85..7230cf71 100644 | ||
| 42 | --- a/src/ast/CMakeLists.txt | ||
| 43 | +++ b/src/ast/CMakeLists.txt | ||
| 44 | @@ -22,6 +22,7 @@ add_library(ast STATIC | ||
| 45 | passes/return_path_analyser.cpp | ||
| 46 | ) | ||
| 47 | |||
| 48 | +add_dependencies(ast parser) | ||
| 49 | target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS}) | ||
| 50 | target_link_libraries(ast PUBLIC ast_defs arch compiler_core parser) | ||
| 51 | |||
| 52 | -- | ||
| 53 | 2.34.1 | ||
| 54 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.5.bb index c8ccf4c83f..1b2f8ab0e4 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.5.bb | |||
| @@ -16,14 +16,11 @@ DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'pahole-native llvm-nativ | |||
| 16 | 16 | ||
| 17 | RDEPENDS:${PN} += "bash python3 xz" | 17 | RDEPENDS:${PN} += "bash python3 xz" |
| 18 | 18 | ||
| 19 | PV .= "+git" | ||
| 20 | |||
| 21 | SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.23.x;protocol=https \ | 19 | SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.23.x;protocol=https \ |
| 22 | file://run-ptest \ | 20 | file://run-ptest \ |
| 23 | file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \ | 21 | file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \ |
| 24 | file://0001-Fix-build-failures-due-to-missing-location.hh.patch \ | ||
| 25 | " | 22 | " |
| 26 | SRCREV = "01e806d24c61f996f1809e1e991646311499db4f" | 23 | SRCREV = "e48ccc66c9971515648b63699bc4b1490c388d85" |
| 27 | 24 | ||
| 28 | inherit bash-completion cmake ptest pkgconfig | 25 | inherit bash-completion cmake ptest pkgconfig |
| 29 | 26 | ||
