From 3ea54510168a7ed4271b85f7292beca67346bfe9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 Sep 2024 12:31:24 +0100 Subject: gentoo auto-resync : 12:09:2024 - 12:31:23 --- dev-util/bcc/Manifest | 3 +- dev-util/bcc/bcc-0.31.0-r2.ebuild | 208 +++++++++++++++++++++ dev-util/bcc/bcc-0.31.0.ebuild | 175 ----------------- .../bcc/files/bcc-0.31.0-no-automagic-deps.patch | 15 ++ 4 files changed, 225 insertions(+), 176 deletions(-) create mode 100644 dev-util/bcc/bcc-0.31.0-r2.ebuild delete mode 100644 dev-util/bcc/bcc-0.31.0.ebuild create mode 100644 dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch (limited to 'dev-util/bcc') diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest index 84d43051517a..82cea62537bc 100644 --- a/dev-util/bcc/Manifest +++ b/dev-util/bcc/Manifest @@ -2,6 +2,7 @@ AUX 60bcc.env 32 BLAKE2B dbbfb31408af7f3375b02981113d81d71075d339fded45db24b2168 AUX bcc-0.23.0-man-compress.patch 704 BLAKE2B 0eceb68e7d7a09b948d24e98c833031751421c829ba99564499b4e4ded9f0bc505b60a2648de7287185d85d847b65f3b929dd08b3fe9f97b1a7aaf9868750ec4 SHA512 7f7c4f4292ab5334201506ba523adc1c9a8e87cd3656a896cf31fe7f48f25e84bb52552f7d02d12442784a72cf7bcb01dec8a63eb2679aa9d84ff935f94d1863 AUX bcc-0.25.0-cmakelists.patch 358 BLAKE2B 0159aa6e483bd5fab0bc920e8416a94a43809d99a29344b17321bc92890614f99cba1bb8bea02522b890be456904250ef2875d2d88b3f6d55022ad2d4ad2910e SHA512 9521e22cb9318b56601e1d27362903d63fcd8954b7539e6e92db267406d8aed6be8261b62f02d186edb82d548d64578bd99674f93c86e36e1fdd43332dc1552a AUX bcc-0.31.0-dont-install-static-libs.patch 867 BLAKE2B 4661b7524cf337bc3b64c0a2465945cf9896bb894383fd42afdcecd6f78878fa9904722f29c8ef1cc0c539f7bd9569c98ea6795defa79c35f74c9ba34030a0dc SHA512 e612a1ea7f97d147e2d8fd26e8929803d37164e209cbb45535742f99ff2f461bd8269ea8983701d7a98287338984a097d371098fdb83e693ac89663f5dcfcaa5 +AUX bcc-0.31.0-no-automagic-deps.patch 459 BLAKE2B 807202dc7acd8e621772d563d9dbd8f03712ab455bc977bf359866e3074ff11e496c8880670e5fe377b43a456d0df554d75f90d64bee0ada4d67e4230578536b SHA512 dfb9032457d1e6253375087ea09910947debe55b57066b6757363a4c86e1e5ced2f9abfe30fe979b2f5e9a596cae836f914440e0d91dc2b5d96943ec20ca41ae AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979 DIST bcc-0.29.1.tar.gz 6778304 BLAKE2B 23df483df59ef7d66117b15628299a32155136aa5254edbf76f7507a972f3ebcba1d4b2aa83c41e8f061eeeb96812f522c34fed27e9a37e5f4ad3478c7cde88f SHA512 9e60130ea602e19e6c6f88a8c17023cea5daf4c5bcc7af8816e9f5c662341136eb449a3fdf870ffad215495ac3bf895115c0d968d92ce79ebe2899b3e2464d24 DIST bcc-0.30.0.tar.gz 6797246 BLAKE2B 517f4fcce8bcaf4c8c17075f9a906b452ee14a0c46fa500c301521fe46d854fcf4f632e741b34168dfeb819d9b0d64b967e716fa6222ba7dcaeddb03570985e6 SHA512 70478ca8c18e7f106c462513ca9af46f49b4ebcca6380a9393208fca88f83895a7396f918bf5d01dce1bc4a876bccb9b95aa56d426e55d384cf11c9baaa6a89b @@ -9,5 +10,5 @@ DIST bcc-0.31.0.tar.gz 6807504 BLAKE2B 75739914a18a7952bbefbed6f55b88d3be4f0483d EBUILD bcc-0.29.1-r1.ebuild 3076 BLAKE2B 336b061630c512e338f92f29cd2cb83b8445436fcd31ae75008f38a989481725b589d185173ced2ba1e86d75017827a8d4619cd53ff59e45280cab67cb733d6d SHA512 544bf5ec686458b51a2e9dbc18ffb10e08d33c1626cee2698c395fa51b283a0e069fefb94dbb1f15a61406fd515a419024811a8f0de7adef4448281752cc09cc EBUILD bcc-0.29.1-r2.ebuild 3214 BLAKE2B 2bd87d02bf6a10f467971dd38ce76d83705664026d8b716c36b3ad03f5fa9263aaeef5df0653a661420620b16831c12cc8fce62148469d666d938fa16ed3316b SHA512 a836d324e5a5da246facc5d35546c719e23b0ed0eb1588252e49a146a4b62e83925ef18d7c6a6ceba2327c58fda471f02a615c560978a43c20816b1f3cfcb8a5 EBUILD bcc-0.30.0-r1.ebuild 3099 BLAKE2B 81fe5952644ea5393523b9652e4e68af72ce496d4ccd6b9c3fdef15a5125dae89619c7c90469b0b5118d5f581b26ebc4fcc64470309495effbeb6bf144ac093e SHA512 98eeb13444dbbe044915fc61d1c3c955f338499e8bdb8ad1ec9229213c14a6783b856b49f7a36c6db30667d882fca07a9221ed25df82eb27e5773102da054724 -EBUILD bcc-0.31.0.ebuild 4056 BLAKE2B 3b3b4bf9b7dbda9576774404297e1a6385a71ac6f55a502946e231ad951d86cd621a2753911244ad8f62f870626e36261a3fa092db5bc3a709799939c71f93d5 SHA512 058c4d1eb7a982b5d41a3f1ba140243a4cf0941f2f1184a2fde205b024fd1195607efddd875c8168788027bc09e6ddfaf524976b2cfe3adf069a5e022f0ec12e +EBUILD bcc-0.31.0-r2.ebuild 4683 BLAKE2B 43682b1eca84468fa5e18b71ba1b570cbf0007306f6cb86013b5e79918b3f3e3364e1cdff4933056afce53cc11caeb3c070b9b9d233c486fd0f27de4a916d92f SHA512 7d6fd7fed86a30d665aca034d71975947d481ec7c6914dc772dd99e2841c9f32beb56bf1421b32eb0de24d8f5c400f1e348376d36289613c06e6215d3197c483 MISC metadata.xml 419 BLAKE2B 8b46153f6ab2d6959a767f105a9e33109f705bf879bd4d6708eb4a85e310140d8f810569bf3e37f89bd5a07758de7653697214643b606dc314009e8b8db709ac SHA512 3036d51a8ff5c5adc507387aad252ab7a90c341c5f04c626158353d938992e78c6b5e344354220141979f91522e0204e388d47fd0ccf91415634f6cde646a0c3 diff --git a/dev-util/bcc/bcc-0.31.0-r2.ebuild b/dev-util/bcc/bcc-0.31.0-r2.ebuild new file mode 100644 index 000000000000..f595931e6352 --- /dev/null +++ b/dev-util/bcc/bcc-0.31.0-r2.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2024 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_{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 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:= + >=dev-libs/libbpf-1.2.0:= + dev-libs/libffi:= + sys-kernel/linux-headers + sys-libs/ncurses:=[tinfo] + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/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" +) + +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_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 + + 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/bcc-0.31.0.ebuild b/dev-util/bcc/bcc-0.31.0.ebuild deleted file mode 100644 index 274d6f9b7d3a..000000000000 --- a/dev-util/bcc/bcc-0.31.0.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2024 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_{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? ( python ${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 - 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" -) - -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 - - 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_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}" - -Wno-dev - ) - if use lua && use lua_single_target_luajit; then - mycmakeargs+=( -DWITH_LUAJIT=1 ) - fi - - cmake_src_configure - bcc_distutils_phase -} - -src_compile() { - cmake_src_compile - bcc_distutils_phase -} - -python_install() { - distutils-r1_python_install - - local tool - for tool in $(grep -Elr '#!/usr/bin/(env |)python' "${MY_S}/tools"); do - local tool_name="${tool##*/}" - python_newscript "${tool}" "${tool_name%.py}" - done -} - -src_install() { - cmake_src_install - bcc_distutils_phase - - 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-no-automagic-deps.patch b/dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch new file mode 100644 index 000000000000..baadf2f7ea6c --- /dev/null +++ b/dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 18407e86..1af91242 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +136,9 @@ if(NOT PYTHON_ONLY) + find_package(FLEX) + find_package(LibElf REQUIRED) + find_package(LibDebuginfod) +- find_package(LibLzma) ++ if(WITH_LZMA) ++ find_package(LibLzma) ++ endif() + if(CLANG_DIR) + set(CMAKE_FIND_ROOT_PATH "${CLANG_DIR}") + include_directories("${CLANG_DIR}/include") -- cgit v1.2.3