From b09a22354f2e86e5e2605292b9b6d555699f33f7 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Tue, 26 Oct 2021 18:18:33 -0700 Subject: dev-util/bpftrace: Fix patch to make sure libaot is installed Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Patrick McLean --- dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild | 98 ---------------------- dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild | 98 ++++++++++++++++++++++ .../files/bpftrace-0.14.0-install-libs.patch | 17 ++-- 3 files changed, 108 insertions(+), 105 deletions(-) delete mode 100644 dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild create mode 100644 dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild (limited to 'dev-util') diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild deleted file mode 100644 index 483f341c4909..000000000000 --- a/dev-util/bpftrace/bpftrace-0.14.0-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs llvm linux-info cmake - -DESCRIPTION="High-level tracing language for eBPF" -HOMEPAGE="https://github.com/iovisor/bpftrace" - -if [[ ${PV} =~ 9{4,} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/iovisor/${PN}" - BDEPEND="" -else - MY_PV="${PV//_/}" - SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - BDEPEND="app-arch/xz-utils " -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="fuzzing test" - -COMMON_DEPEND=" - dev-libs/libbpf:= - >=dev-util/bcc-0.13.0:= - dev-util/systemtap - >=sys-devel/llvm-6:=[llvm_targets_BPF(+)] - <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] - <=sys-devel/clang-13:= - sys-libs/binutils-libs:= - virtual/libelf -" -DEPEND=" - ${COMMON_DEPEND} - dev-libs/cereal:= - test? ( dev-cpp/gtest ) -" -RDEPEND=" - ${COMMON_DEPEND} -" -BDEPEND+=" - >=dev-util/cmake-3.8 - sys-devel/flex - sys-devel/bison -" - -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" -QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" - -PATCHES=( - "${FILESDIR}/bpftrace-0.14.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" - "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch" -) - -# lots of fixing needed -RESTRICT="test" - -pkg_pretend() { - local CONFIG_CHECK=" - ~BPF - ~BPF_EVENTS - ~BPF_JIT - ~BPF_SYSCALL - ~FTRACE_SYSCALLS - ~HAVE_EBPF_JIT - " - - check_extra_config -} - -pkg_setup() { - LLVM_MAX_SLOT=12 llvm_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs=( - -DSTATIC_LINKING:BOOL=OFF - -DBUILD_TESTING:BOOL=OFF - -DBUILD_FUZZ:BOOL=$(usex fuzzing) - -DENABLE_MAN:BOOL=OFF - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - doman man/man8/*.? -} diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild new file mode 100644 index 000000000000..483f341c4909 --- /dev/null +++ b/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild @@ -0,0 +1,98 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs llvm linux-info cmake + +DESCRIPTION="High-level tracing language for eBPF" +HOMEPAGE="https://github.com/iovisor/bpftrace" + +if [[ ${PV} =~ 9{4,} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/iovisor/${PN}" + BDEPEND="" +else + MY_PV="${PV//_/}" + SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + BDEPEND="app-arch/xz-utils " +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="fuzzing test" + +COMMON_DEPEND=" + dev-libs/libbpf:= + >=dev-util/bcc-0.13.0:= + dev-util/systemtap + >=sys-devel/llvm-6:=[llvm_targets_BPF(+)] + <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] + <=sys-devel/clang-13:= + sys-libs/binutils-libs:= + virtual/libelf +" +DEPEND=" + ${COMMON_DEPEND} + dev-libs/cereal:= + test? ( dev-cpp/gtest ) +" +RDEPEND=" + ${COMMON_DEPEND} +" +BDEPEND+=" + >=dev-util/cmake-3.8 + sys-devel/flex + sys-devel/bison +" + +S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" +QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" + +PATCHES=( + "${FILESDIR}/bpftrace-0.14.0-install-libs.patch" + "${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch" + "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" + "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch" +) + +# lots of fixing needed +RESTRICT="test" + +pkg_pretend() { + local CONFIG_CHECK=" + ~BPF + ~BPF_EVENTS + ~BPF_JIT + ~BPF_SYSCALL + ~FTRACE_SYSCALLS + ~HAVE_EBPF_JIT + " + + check_extra_config +} + +pkg_setup() { + LLVM_MAX_SLOT=12 llvm_pkg_setup +} + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local -a mycmakeargs=( + -DSTATIC_LINKING:BOOL=OFF + -DBUILD_TESTING:BOOL=OFF + -DBUILD_FUZZ:BOOL=$(usex fuzzing) + -DENABLE_MAN:BOOL=OFF + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + doman man/man8/*.? +} diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch index dc8e89052602..2e2484a2efe1 100644 --- a/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch +++ b/dev-util/bpftrace/files/bpftrace-0.14.0-install-libs.patch @@ -70,10 +70,18 @@ index 47a050e2..1bbcf882 100644 if (LIBBPF_BTF_DUMP_FOUND) target_include_directories(runtime PUBLIC ${LIBBPF_INCLUDE_DIRS}) diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt -index 291d53f2..308691ee 100644 +index 291d53f2..22944ddc 100644 --- a/src/aot/CMakeLists.txt +++ b/src/aot/CMakeLists.txt -@@ -10,7 +10,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME) +@@ -2,6 +2,7 @@ add_library(aot aot.cpp) + target_include_directories(aot PUBLIC ${CMAKE_SOURCE_DIR}/src) + target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR}) + target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS}) ++install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + # Only build aotrt if supported bcc is used + # (https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44) +@@ -10,7 +11,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME) endif() add_executable(bpftrace-aotrt aot_main.cpp) @@ -82,11 +90,6 @@ index 291d53f2..308691ee 100644 install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR}) # Linking -@@ -27,3 +27,4 @@ if(BUILD_ASAN) - target_compile_options(bpftrace-aotrt PUBLIC "-fsanitize=address") - target_link_options(bpftrace-aotrt PUBLIC "-fsanitize=address") - endif() -+install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt index 76bb217e..4ad0f626 100644 --- a/src/arch/CMakeLists.txt -- cgit v1.2.3-65-gdbad