From 2b52be0c01a2d94c204c6e870d323479444e6c54 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 5 Jul 2023 16:56:15 -0700 Subject: [PATCH] bcc: Upgrade to 0.28.0 Add python3-setuptools-native to depends Signed-off-by: Khem Raj --- .../bcc/bcc/0001-tests-cc-Use-c-14-standard.patch | 11 +++-------- .../bcc/{bcc_0.26.0.bb => bcc_0.28.0.bb} | 3 ++- 2 files changed, 5 insertions(+), 9 deletions(-) rename dynamic-layers/openembedded-layer/recipes-devtools/bcc/{bcc_0.26.0.bb => bcc_0.28.0.bb} (96%) diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch index 48754f6b..dcd9dc17 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch +++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch @@ -14,13 +14,11 @@ Cc: Hengqi Chen tests/cc/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/tests/cc/CMakeLists.txt b/tests/cc/CMakeLists.txt -index bc870b07..b45f2369 100644 --- a/tests/cc/CMakeLists.txt +++ b/tests/cc/CMakeLists.txt -@@ -23,6 +23,10 @@ add_compile_options(-DCMAKE_CURRENT_BINARY_DIR="${CMAKE_CURRENT_BINARY_DIR}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result -fPIC") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result -fPIC") +@@ -27,6 +27,10 @@ if(${LLVM_PACKAGE_VERSION} VERSION_EQUAL + set(CMAKE_CXX_STANDARD 14) + endif() +if(${LLVM_PACKAGE_VERSION} VERSION_EQUAL 16 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 16) +set(CMAKE_CXX_STANDARD 14) @@ -29,6 +27,3 @@ index bc870b07..b45f2369 100644 if(ENABLE_USDT) set(TEST_LIBBCC_SOURCES test_libbcc.cc --- -2.39.2 - diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.26.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.28.0.bb similarity index 96% rename from dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.26.0.bb rename to dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.28.0.bb index ba773b62..530b4686 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.26.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.28.0.bb @@ -13,6 +13,7 @@ DEPENDS += "bison-native \ ${LUAJIT} \ clang \ libbpf \ + python3-setuptools-native \ " LUAJIT ?= "luajit" @@ -33,7 +34,7 @@ SRC_URI = "gitsm://github.com/iovisor/bcc;branch=master;protocol=https \ file://ptest_wrapper.sh \ " -SRCREV = "9b5af1b0c140c8dbcbd9b821dccf2f7fceb6429c" +SRCREV = "8422cd449ad2e60414a4508aa4a150a9db39c4a3" PV .= "+git${SRCPV}"