From 581ef61adb5047ac9df81e45de2beb31f474bd93 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Jan 2025 07:07:01 +0000 Subject: [PATCH] dev-util/perf: Sync with Gentoo It's from Gentoo commit c3181eece1fe233e1d8bb86ee4fd6a92a04ad35b. --- .../perf/{perf-6.11.7.ebuild => perf-6.11.7-r1.ebuild} | 5 +++-- .../dev-util/perf/{perf-6.12.ebuild => perf-6.12-r1.ebuild} | 5 +++-- .../third_party/portage-stable/dev-util/perf/perf-6.7.ebuild | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-util/perf/{perf-6.11.7.ebuild => perf-6.11.7-r1.ebuild} (99%) rename sdk_container/src/third_party/portage-stable/dev-util/perf/{perf-6.12.ebuild => perf-6.12-r1.ebuild} (99%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.11.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.11.7-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.11.7.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.11.7-r1.ebuild index 9b0cb46b57..50b8125899 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.11.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.11.7-r1.ebuild @@ -66,8 +66,8 @@ RDEPEND=" dev-util/bpftool dev-util/pahole $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT}= - sys-devel/llvm:${LLVM_SLOT}= + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') ) caps? ( sys-libs/libcap ) @@ -279,6 +279,7 @@ perf_make() { NO_LIBCRYPTO=$(puse crypt) NO_LIBDW_DWARF_UNWIND="${disable_libdw}" NO_LIBELF= + NO_LIBLLVM=$(puse bpf) NO_LIBNUMA=$(puse numa) NO_LIBPERL=$(puse perl) NO_LIBPFM4=$(puse libpfm) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.12-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.12.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.12-r1.ebuild index c3d4af9bc2..c8df399468 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.12-r1.ebuild @@ -66,8 +66,8 @@ RDEPEND=" dev-util/bpftool dev-util/pahole $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT}= - sys-devel/llvm:${LLVM_SLOT}= + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') ) caps? ( sys-libs/libcap ) @@ -283,6 +283,7 @@ perf_make() { NO_LIBCRYPTO=$(puse crypt) NO_LIBDW_DWARF_UNWIND="${disable_libdw}" NO_LIBELF= + NO_LIBLLVM=$(puse bpf) NO_LIBNUMA=$(puse numa) NO_LIBPERL=$(puse perl) NO_LIBPFM4=$(puse libpfm) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.7.ebuild index 99074877b2..7ddda6cf41 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.7.ebuild @@ -67,8 +67,8 @@ RDEPEND=" ) caps? ( sys-libs/libcap ) bpf? ( - sys-devel/clang:= - sys-devel/llvm:= + llvm-core/clang:= + llvm-core/llvm:= ) crypt? ( dev-libs/openssl:= ) gtk? ( x11-libs/gtk+:2 )