diff --git a/dev-util/bcc/bcc-0.36.1-r1.ebuild b/dev-util/bcc/bcc-0.36.1-r1.ebuild new file mode 100644 index 0000000000000..6d062c15d3e69 --- /dev/null +++ b/dev-util/bcc/bcc-0.36.1-r1.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{{11..14},{13..14}t} ) +LLVM_COMPAT=( {16..22} ) + +inherit cmake linux-info llvm-r1 lua-single distutils-r1 toolchain-funcs + +DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" +HOMEPAGE="https://iovisor.github.io/bcc/" +SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="debuginfod +lua lzma +python static-libs test" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + lua? ( python ${LUA_REQUIRED_USE} ) +" + +# tests need root access +RESTRICT="test" + +RDEPEND=" + app-arch/zstd:= + >=dev-libs/elfutils-0.166:=[debuginfod?] + dev-libs/libbpf:= + dev-libs/libffi:= + sys-kernel/linux-headers + sys-libs/ncurses:=[tinfo] + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= + ') + lzma? ( || ( + app-arch/xz-utils + app-arch/lzma + ) ) + python? ( ${PYTHON_DEPS} ) + lua? ( ${LUA_DEPS} ) +" +DEPEND=" + ${RDEPEND} + test? ( + || ( + net-misc/iputils[arping] + net-analyzer/arping + ) + net-analyzer/netperf + net-misc/iperf:* + ) +" +BDEPEND=" + app-arch/zip + sys-devel/flex + sys-devel/bison + virtual/pkgconfig + python? ( ${DISTUTILS_DEPS} ) +" + +PATCHES=( + "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" + "${FILESDIR}/bcc-0.25.0-cmakelists.patch" + "${FILESDIR}/bcc-0.23.0-man-compress.patch" + "${FILESDIR}/bcc-0.31.0-no-automagic-deps.patch" + "${FILESDIR}/bcc-0.36.1-const.patch" + "${FILESDIR}/bcc-0.36.1-getUnqual.patch" + "${FILESDIR}/bcc-0.36.1-llvm22.patch" + "${FILESDIR}/bcc-0.36.1-no-libbpf-git.patch" +) + +pkg_pretend() { + local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF + ~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL + ~KPROBES" + + check_extra_config +} + +pkg_setup() { + llvm-r1_pkg_setup + use python && python_setup +} + +bcc_distutils_phase() { + if use python; then + local python_phase_func="distutils-r1_${EBUILD_PHASE_FUNC}" + + if declare -f "${python_phase_func}" > /dev/null; then + pushd "${S}/src/python" > /dev/null || die + MY_S="${S}" S="${S}/src/python" "${python_phase_func}" + popd > /dev/null || die + else + die "Called ${FUNCNAME[0]} called in ${EBUILD_PHASE_FUNC}, but ${python_phase_func} doesn't exist" + fi + fi +} + +src_prepare() { + local bpf_link_path + + # this avoids bundling + bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die + ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die + + # bug 811288 + local script scriptname + for script in $(find tools/old -type f -name "*.py" || die); do + mv "${script}" "tools/old/old-${script##*/}" || die + done + + sed -i '/#include /d' examples/cpp/KModRetExample.cc || die + + use static-libs || PATCHES+=( "${FILESDIR}/bcc-0.31.0-dont-install-static-libs.patch" ) + + # use distutils-r1 eclass funcs rather than letting upstream handle python + printf '\n' > src/python/CMakeLists.txt || die + + if use python; then + for python_file in $(find "${S}/src/python" -name '*.py.in' || die); do + sed "s:@REVISION@:${PV%%_*}:" "${python_file}" > "${python_file%.in}" || die + done + fi + + cmake_src_prepare + bcc_distutils_phase +} + +src_configure() { + local mycmakeargs=( + -DREVISION=${PV%%_*} + -DENABLE_LIBDEBUGINFOD=$(usex debuginfod) + -DENABLE_LLVM_SHARED=ON + -DENABLE_NO_PIE=OFF + -DWITH_LZMA=$(usex lzma) + -DCMAKE_USE_LIBBPF_PACKAGE=ON + -DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')" + -DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}" + -DNO_BLAZESYM=ON + -Wno-dev + ) + if use lua && use lua_single_target_luajit; then + mycmakeargs+=( -DWITH_LUAJIT=ON ) + fi + + cmake_src_configure + bcc_distutils_phase +} + +src_compile() { + cmake_src_compile + bcc_distutils_phase +} + +bcc_tool_name() { + local -A rename_tools=( + [trace]=1 + [profile]=1 + [inject]=1 + [capable]=1 + ) + + local name="${1}" + + local name="${name##*/}" + name="${name%.py}" + + [[ -n ${rename_tools[${name}]} ]] && name=bcc-${name} + + printf -- '%s\n' "${name}" +} + +python_install() { + distutils-r1_python_install + + python_scriptinto /usr/sbin + + local tool + for tool in $(grep -Elr '#!/usr/bin/(env |)python' "${MY_S}/tools"); do + python_newscript "${tool}" "$(bcc_tool_name "${tool}")" + done +} + +src_install() { + cmake_src_install + bcc_distutils_phase + + newenvd "${FILESDIR}"/60bcc.env 60bcc.env + + local tool target + for tool in "${ED}"/usr/share/bcc/tools/*; do + [[ -d ${tool} || ! -x ${tool} || ${tool} =~ .*[.](c|txt) ]] && continue + grep -qE '^#!/usr/bin/(env |)python' "${tool}" && continue + sed -e 's:dirname \$0:dirname "$(realpath "$0")":' -i "${tool}" || die + + target="/usr/sbin/$(bcc_tool_name "${tool}")" + [[ -e ${ED}${target} ]] && continue + + dosym -r "${tool#${ED}}" "${target}" + done + + docompress /usr/share/${PN}/man + + newenvd - "70${P}" <<-_EOF_ + MANPATH="${EPREFIX}/usr/share/${PN}/man" + _EOF_ +} diff --git a/dev-util/bcc/files/bcc-0.36.1-const.patch b/dev-util/bcc/files/bcc-0.36.1-const.patch new file mode 100644 index 0000000000000..40edb6e006e3e --- /dev/null +++ b/dev-util/bcc/files/bcc-0.36.1-const.patch @@ -0,0 +1,24 @@ +https://github.com/iovisor/bcc/pull/5481 + +--- bcc/src/cc/bcc_perf_map.c ++++ bcc/src/cc/bcc_perf_map.c +@@ -23,7 +23,7 @@ + #include "bcc_perf_map.h" + + bool bcc_is_perf_map(const char *path) { +- char* pos = strstr(path, ".map"); ++ const char* pos = strstr(path, ".map"); + // Path ends with ".map" + return (pos != NULL) && (*(pos + 4)== 0); + } +--- bcc/src/cc/libbpf.c ++++ bcc/src/cc/libbpf.c +@@ -787,7 +787,7 @@ int bcc_prog_load_xattr(enum bpf_prog_ty + int ret = 0, name_offset = 0, expected_attach_type = 0; + char new_prog_name[BPF_OBJ_NAME_LEN] = {}; + char mod_name[64] = {}; +- char *mod_end; ++ const char *mod_end; + int mod_len; + int fd = -1; + diff --git a/dev-util/bcc/files/bcc-0.36.1-getUnqual.patch b/dev-util/bcc/files/bcc-0.36.1-getUnqual.patch new file mode 100644 index 0000000000000..52b2fc04d2f15 --- /dev/null +++ b/dev-util/bcc/files/bcc-0.36.1-getUnqual.patch @@ -0,0 +1,22 @@ +https://github.com/iovisor/bcc/issues/5472 + +--- bcc/src/cc/bpf_module_rw_engine.cc ++++ bcc/src/cc/bpf_module_rw_engine.cc +@@ -286,7 +286,7 @@ string BPFModule::make_reader(Module *mo + + string name = "reader" + std::to_string(readers_.size()); + #if LLVM_VERSION_MAJOR >= 18 +- vector fn_args({B.getPtrTy(), PointerType::getUnqual(type)}); ++ vector fn_args({B.getPtrTy(), PointerType::getUnqual(type->getContext())}); + #else + vector fn_args({B.getInt8PtrTy(), PointerType::getUnqual(type)}); + #endif +@@ -354,7 +354,7 @@ string BPFModule::make_writer(Module *mo + + string name = "writer" + std::to_string(writers_.size()); + #if LLVM_VERSION_MAJOR >= 18 +- vector fn_args({B.getPtrTy(), B.getInt64Ty(), PointerType::getUnqual(type)}); ++ vector fn_args({B.getPtrTy(), B.getInt64Ty(), PointerType::getUnqual(type->getContext())}); + #else + vector fn_args({B.getInt8PtrTy(), B.getInt64Ty(), PointerType::getUnqual(type)}); + #endif diff --git a/dev-util/bcc/files/bcc-0.36.1-llvm22.patch b/dev-util/bcc/files/bcc-0.36.1-llvm22.patch new file mode 100644 index 0000000000000..58d7ca97d0b88 --- /dev/null +++ b/dev-util/bcc/files/bcc-0.36.1-llvm22.patch @@ -0,0 +1,42 @@ +https://github.com/iovisor/bcc/pull/5484 + +diff --git a/src/cc/frontends/clang/loader.cc b/src/cc/frontends/clang/loader.cc +index 6f8387a..1f70634 100644 +--- a/src/cc/frontends/clang/loader.cc ++++ b/src/cc/frontends/clang/loader.cc +@@ -464,7 +464,10 @@ int ClangLoader::do_compile( + } + invocation0.getFrontendOpts().DisableFree = false; + +-#if LLVM_VERSION_MAJOR >= 20 ++#if LLVM_VERSION_MAJOR >= 22 ++ compiler0.setVirtualFileSystem(llvm::vfs::getRealFileSystem()); ++ compiler0.createDiagnostics(new IgnoringDiagConsumer()); ++#elif LLVM_VERSION_MAJOR >= 20 + compiler0.createDiagnostics(*llvm::vfs::getRealFileSystem(), new IgnoringDiagConsumer()); + #else + compiler0.createDiagnostics(new IgnoringDiagConsumer()); +@@ -487,7 +490,10 @@ int ClangLoader::do_compile( + add_main_input(invocation1, main_path, &*out_buf); + invocation1.getFrontendOpts().DisableFree = false; + +-#if LLVM_VERSION_MAJOR >= 20 ++#if LLVM_VERSION_MAJOR >= 22 ++ compiler1.setVirtualFileSystem(llvm::vfs::getRealFileSystem()); ++ compiler1.createDiagnostics(); ++#elif LLVM_VERSION_MAJOR >= 20 + compiler1.createDiagnostics(*llvm::vfs::getRealFileSystem()); + #else + compiler1.createDiagnostics(); +@@ -517,7 +523,10 @@ int ClangLoader::do_compile( + invocation2.getCodeGenOpts().setInlining(CodeGenOptions::NormalInlining); + // suppress warnings in the 2nd pass, but bail out on errors (our fault) + invocation2.getDiagnosticOpts().IgnoreWarnings = true; +-#if LLVM_VERSION_MAJOR >= 20 ++#if LLVM_VERSION_MAJOR >= 22 ++ compiler2.setVirtualFileSystem(llvm::vfs::getRealFileSystem()); ++ compiler2.createDiagnostics(); ++#elif LLVM_VERSION_MAJOR >= 20 + compiler2.createDiagnostics(*llvm::vfs::getRealFileSystem()); + #else + compiler2.createDiagnostics(); diff --git a/dev-util/bcc/files/bcc-0.36.1-no-libbpf-git.patch b/dev-util/bcc/files/bcc-0.36.1-no-libbpf-git.patch new file mode 100644 index 0000000000000..729988b32b453 --- /dev/null +++ b/dev-util/bcc/files/bcc-0.36.1-no-libbpf-git.patch @@ -0,0 +1,53 @@ +Do not try to update the tarball-bundled libbpf with git, which only +throws confusing errors. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8e497e6..62ef3fc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,45 +39,6 @@ if(NOT NO_BLAZESYM) + endif() + endif() + +-# populate submodules (libbpf) +-if(NOT CMAKE_USE_LIBBPF_PACKAGE) +- execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE CONFIG_RESULT) +- if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0) +- message(WARNING "Failed to add libbpf source directory to safe.directory") +- endif() +- execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/libbpf-tools/bpftool +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE CONFIG_RESULT) +- if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0) +- message(WARNING "Failed to add bpftool source directory to safe.directory") +- endif() +- +- if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src) +- execute_process(COMMAND git submodule update --init --recursive +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE UPDATE_RESULT) +- if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0) +- message(WARNING "Failed to update submodule libbpf") +- endif() +- else() +- execute_process(COMMAND git diff --shortstat ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/ +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE DIFF_STATUS) +- if("${DIFF_STATUS}" STREQUAL "") +- execute_process(COMMAND git submodule update --init --recursive +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE UPDATE_RESULT) +- if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0) +- message(WARNING "Failed to update submodule libbpf") +- endif() +- else() +- message(WARNING "submodule libbpf dirty, so no sync") +- endif() +- endif() +-endif() +- + # It's possible to use other kernel headers with + # KERNEL_INCLUDE_DIRS build variable, like: + # $ cd