diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest index c0ded9bb2e07..21248e0a7452 100644 --- a/dev-util/bcc/Manifest +++ b/dev-util/bcc/Manifest @@ -1,3 +1,4 @@ DIST bcc-0.28.0.tar.gz 6148954 BLAKE2B cfd3c8d63128e050512462449ff7d467f8f809c239ac01ae8e75365e89116ec351641a68682d23472aa3b4e265547bb20ca5572084c532a40ccd3131edf255a2 SHA512 792ce93dba64b1f87390b2602dcaeba04ac8b2863652b06eb9a907b93bc6137a944b856cc6fa9c7a38671c89814740967561ca4f3b29c267babca7dc5e78aa02 DIST bcc-0.29.1.tar.gz 6778304 BLAKE2B 23df483df59ef7d66117b15628299a32155136aa5254edbf76f7507a972f3ebcba1d4b2aa83c41e8f061eeeb96812f522c34fed27e9a37e5f4ad3478c7cde88f SHA512 9e60130ea602e19e6c6f88a8c17023cea5daf4c5bcc7af8816e9f5c662341136eb449a3fdf870ffad215495ac3bf895115c0d968d92ce79ebe2899b3e2464d24 DIST bcc-0.30.0.tar.gz 6797246 BLAKE2B 517f4fcce8bcaf4c8c17075f9a906b452ee14a0c46fa500c301521fe46d854fcf4f632e741b34168dfeb819d9b0d64b967e716fa6222ba7dcaeddb03570985e6 SHA512 70478ca8c18e7f106c462513ca9af46f49b4ebcca6380a9393208fca88f83895a7396f918bf5d01dce1bc4a876bccb9b95aa56d426e55d384cf11c9baaa6a89b +DIST bcc-0.31.0.tar.gz 6807504 BLAKE2B 75739914a18a7952bbefbed6f55b88d3be4f0483d2fd74bf7d6f7a6491d659ab893e7bd6b5e74c7b2239d6a2a9db04522487e3b36e7ddf65b1cc2d8712f786a8 SHA512 a1fe855c316d0508814dc02382b13897ff565bee52de0fc9d7521eabd304227e41bf7d322b10ab29fd5b13aeac85cc75ee76ac348cf1f4bb6499b8853bac10ab diff --git a/dev-util/bcc/bcc-0.31.0.ebuild b/dev-util/bcc/bcc-0.31.0.ebuild new file mode 100644 index 000000000000..da997efba89c --- /dev/null +++ b/dev-util/bcc/bcc-0.31.0.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) +CMAKE_IN_SOURCE_BUILD=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) +LLVM_COMPAT=( {15..18} ) + +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="+lua +python static-libs test" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + lua? ( ${LUA_REQUIRED_USE} ) +" + +# tests need root access +RESTRICT="test" + +RDEPEND=" + >=dev-libs/elfutils-0.166:= + >=dev-libs/libbpf-1.2.0:= + sys-kernel/linux-headers + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') + 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 + virtual/pkgconfig +" + +REQUIRED_USE=" + lua? ( python ) +" + +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-python-distutils.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 +} + +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 + + use static-libs || PATCHES+=( "${FILESDIR}/bcc-0.31.0-dont-install-static-libs.patch" ) + + cmake_src_prepare + use python && distutils-r1_src_prepare +} + +src_configure() { + if use python; then + local impl bcc_python_impls + for impl in "${PYTHON_COMPAT[@]}"; do + use "python_targets_${impl}" && bcc_python_impls+="${impl/_/.};" + done + fi + + local mycmakeargs=( + -DREVISION=${PV%%_*} + -DENABLE_LLVM_SHARED=ON + -DENABLE_NO_PIE=OFF + -DCMAKE_USE_LIBBPF_PACKAGE=ON + -DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')" + -DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}" + -DPYTHON_CMD="${bcc_python_impls%;}" + -Wno-dev + ) + if use lua && use lua_single_target_luajit; then + mycmakeargs+=( -DWITH_LUAJIT=1 ) + fi + + cmake_src_configure +} + +python_compile() { + local BUILD_DIR="${S}/src/python/bcc-${EPYTHON}" + + pushd "${BUILD_DIR}" >/dev/null || die + distutils-r1_python_compile + _distutils-r1_post_python_compile + popd >/dev/null || die +} + +python_compile_all() { :; } + +src_compile() { + cmake_src_compile + use python && distutils-r1_src_compile +} + +python_install() { + local BUILD_DIR="${S}/src/python/bcc-${EPYTHON}" + + python_doscript $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools") + pushd "${BUILD_DIR}" >/dev/null || die + distutils-r1_python_install + popd >/dev/null || die +} + +src_install() { + cmake_src_install + use python && distutils-r1_src_install + + newenvd "${FILESDIR}"/60bcc.env 60bcc.env + local -A rename_tools=( + [trace]=1 + ) + + local tool name + for tool in "${ED}"/usr/share/bcc/tools/*; do + [[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue + name=${tool##*/} + [[ -n ${rename_tools[${name}]} ]] && name=bcc-${name} + dosym -r "${tool#${ED}}" /usr/sbin/${name} + 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.31.0-dont-install-static-libs.patch b/dev-util/bcc/files/bcc-0.31.0-dont-install-static-libs.patch new file mode 100644 index 000000000000..b600f128ebb0 --- /dev/null +++ b/dev-util/bcc/files/bcc-0.31.0-dont-install-static-libs.patch @@ -0,0 +1,13 @@ +diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt +index 104eff0e..e34b911a 100644 +--- a/src/cc/CMakeLists.txt ++++ b/src/cc/CMakeLists.txt +@@ -179,7 +179,7 @@ target_link_libraries(bcc-shared ${bcc_common_libs_for_s}) + target_link_libraries(bcc-static ${bcc_common_libs_for_a} bcc-loader-static) + set(bcc-lua-static ${bcc-lua-static} ${bcc_common_libs_for_lua}) + +-install(TARGETS bcc-shared bcc-static bcc-loader-static bpf-static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS bcc-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${bcc_table_headers} DESTINATION include/bcc) + install(FILES ${bcc_api_headers} DESTINATION include/bcc) + install(DIRECTORY ${libbpf_uapi} DESTINATION include/bcc/compat/linux FILES_MATCHING PATTERN "*.h") diff --git a/dev-util/bcc/files/bcc-0.31.0-python-distutils.patch b/dev-util/bcc/files/bcc-0.31.0-python-distutils.patch new file mode 100644 index 000000000000..9818da6b0e25 --- /dev/null +++ b/dev-util/bcc/files/bcc-0.31.0-python-distutils.patch @@ -0,0 +1,29 @@ +diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt +index 7f5b103e..3da06aca 100644 +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -27,24 +27,7 @@ foreach(PY_CMD ${PYTHON_CMD}) + configure_file(${PY_INC} ${PY_DIRECTORY}/${PY_INC_REPLACED} @ONLY) + endforeach() + +- set(PIP_INSTALLABLE "${PY_DIRECTORY}/dist/bcc-${REVISION}.tar.gz") +- add_custom_command( +- OUTPUT ${PIP_INSTALLABLE} +- COMMAND ${PY_CMD} setup.py sdist +- WORKING_DIRECTORY ${PY_DIRECTORY} +- DEPENDS ${PYTHON_SOURCES} ${PYTHON_INCLUDES} +- COMMENT "Building sdist for ${PY_CMD}" +- ) +- add_custom_target(bcc_py_${PY_CMD_ESCAPED} ALL DEPENDS ${PIP_INSTALLABLE}) +- + if(NOT PYTHON_PREFIX) + set(PYTHON_PREFIX ${CMAKE_INSTALL_PREFIX}) + endif() +- +- install( +- CODE " +- execute_process( +- COMMAND ${PY_CMD} setup.py install -f ${PYTHON_FLAGS} --prefix=${PYTHON_PREFIX} --record ${CMAKE_BINARY_DIR}/install_manifest_python_bcc.txt +- WORKING_DIRECTORY ${PY_DIRECTORY})" +- COMPONENT python) + endforeach()