summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/bcc/bcc-0.31.0-r2.ebuild (renamed from dev-util/bcc/bcc-0.31.0-r1.ebuild)55
-rw-r--r--dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch15
-rw-r--r--dev-util/bpftool/bpftool-7.5.0-r1.ebuild2
-rw-r--r--dev-util/cppcheck/cppcheck-2.14.2.ebuild2
-rw-r--r--dev-util/libabigail/libabigail-2.5.ebuild13
-rw-r--r--dev-util/libabigail/libabigail-9999.ebuild14
6 files changed, 81 insertions, 20 deletions
diff --git a/dev-util/bcc/bcc-0.31.0-r1.ebuild b/dev-util/bcc/bcc-0.31.0-r2.ebuild
index 04719b384fbc..1a79fc86b154 100644
--- a/dev-util/bcc/bcc-0.31.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.31.0-r2.ebuild
@@ -18,7 +18,7 @@ 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"
+IUSE="+lua lzma +python static-libs test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -29,13 +29,20 @@ REQUIRED_USE="
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} )
"
@@ -52,6 +59,8 @@ DEPEND="
"
BDEPEND="
app-arch/zip
+ sys-devel/flex
+ sys-devel/bison
virtual/pkgconfig
python? ( ${DISTUTILS_DEPS} )
"
@@ -60,6 +69,7 @@ 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() {
@@ -102,6 +112,8 @@ src_prepare() {
mv "${script}" "tools/old/old-${script##*/}" || die
done
+ sed -i '/#include <error.h>/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
@@ -122,13 +134,15 @@ src_configure() {
-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=1 )
+ mycmakeargs+=( -DWITH_LUAJIT=ON )
fi
cmake_src_configure
@@ -140,13 +154,32 @@ 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
- local tool_name="${tool##*/}"
- python_newscript "${tool}" "${tool_name%.py}"
+ python_newscript "${tool}" "$(bcc_tool_name "${tool}")"
done
}
@@ -155,9 +188,17 @@ src_install() {
bcc_distutils_phase
newenvd "${FILESDIR}"/60bcc.env 60bcc.env
- local -A rename_tools=(
- [trace]=1
- )
+
+ 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
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")
diff --git a/dev-util/bpftool/bpftool-7.5.0-r1.ebuild b/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
index d7d3a39d1e0e..4ab0c6e287cb 100644
--- a/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
+++ b/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
@@ -26,7 +26,7 @@ S="${S_K}/tools/bpf/bpftool"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="caps llvm"
RDEPEND="
diff --git a/dev-util/cppcheck/cppcheck-2.14.2.ebuild b/dev-util/cppcheck/cppcheck-2.14.2.ebuild
index 1a4d35ad2b30..200ca3f35523 100644
--- a/dev-util/cppcheck/cppcheck-2.14.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.14.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE="charts gui qt6 htmlreport pcre test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
diff --git a/dev-util/libabigail/libabigail-2.5.ebuild b/dev-util/libabigail/libabigail-2.5.ebuild
index 023cd2689a90..17f0f07f7210 100644
--- a/dev-util/libabigail/libabigail-2.5.ebuild
+++ b/dev-util/libabigail/libabigail-2.5.ebuild
@@ -16,14 +16,15 @@ LIBABIGAIL_DOCS_USEFLAG="+doc"
PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
+inherit libtool bash-completion-r1 python-any-r1 out-of-source
DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
HOMEPAGE="https://sourceware.org/libabigail/"
if [[ ${PV} == 9999 ]] ; then
LIBABIGAIL_DOCS_PREBUILT=0
EGIT_REPO_URI="https://sourceware.org/git/libabigail.git"
- inherit git-r3
+ EGIT_SUBMODULES=()
+ inherit autotools git-r3
else
SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz"
if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
@@ -58,9 +59,11 @@ BDEPEND="
src_prepare() {
default
- # need to run our autotools, due to ltmain.sh including Redhat calls:
- # cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
- eautoreconf
+ if [[ ${PV} = 9999 ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
}
my_src_configure() {
diff --git a/dev-util/libabigail/libabigail-9999.ebuild b/dev-util/libabigail/libabigail-9999.ebuild
index 0df21df7cafd..ab4c5d13d6c9 100644
--- a/dev-util/libabigail/libabigail-9999.ebuild
+++ b/dev-util/libabigail/libabigail-9999.ebuild
@@ -16,14 +16,15 @@ LIBABIGAIL_DOCS_USEFLAG="+doc"
PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
+inherit libtool bash-completion-r1 python-any-r1 out-of-source
DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
HOMEPAGE="https://sourceware.org/libabigail/"
if [[ ${PV} == 9999 ]] ; then
LIBABIGAIL_DOCS_PREBUILT=0
EGIT_REPO_URI="https://sourceware.org/git/libabigail.git"
- inherit git-r3
+ EGIT_SUBMODULES=()
+ inherit autotools git-r3
else
SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz"
if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
@@ -58,9 +59,11 @@ BDEPEND="
src_prepare() {
default
- # need to run our autotools, due to ltmain.sh including Redhat calls:
- # cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
- eautoreconf
+ if [[ ${PV} = 9999 ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
}
my_src_configure() {
@@ -71,7 +74,6 @@ my_src_configure() {
--disable-rpm
--disable-rpm415
--disable-ctf
- --disable-debug-ct-propagation
# Don't try to run Valgrind on tests.
--disable-valgrind
--enable-bash-completion
generated by cgit v1.3 (git 2.53.0) at 2026-10-13 12:41:53 +0000