gentoo resync : 16.04.2022

4 files changed, 80 insertions, 20 deletions

diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 4c9b658b549d..35b8c02141ce 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,8 +1,10 @@
 AUX perf-5.15-clang.patch 8700 BLAKE2B cfe9ab41fc2ac49d2d7cbdfe2a4b009dc1c0dad93fb1a54e5ed541208afccb2f55ae420db6321ac360c5b2f6351b04f458fff21abd581d4da5e3296608c3b3da SHA512 49a88809100bdd63241064a8b19e866ba2d91dc78dd279c979982cbb96e91061f6a93ded1a596364f1d7b3410ed10811ae21c23b046370654c3f32c9d0d468cc
-DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
+AUX perf-5.17.1-clang.patch 2350 BLAKE2B 5010e3f90feafdd340b49000f2140857e8511a771acafa017224242f1a7361abd9a60a698923288dc13d53d8346985e40a069469dc1ca346b5b7ae058622322d SHA512 03086f968bdd31a9545a45c92d461f1ad9bc62d0fbd6de8b726925f422e436ab71002cafeadb7540bba0be553b426fe5e5b69e895f974497c6777354987ad375
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
+DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-EBUILD perf-5.12-r1.ebuild 7445 BLAKE2B 5b9b2f1ba4ae9a04dcc62598f52874cae7a2808cdaffa0e7985d9f22caf8c1a7a3ccce75f193e79b607ec8c7740bf2ef30b3a9120ed604905106dac56fc8c1ee SHA512 ac9ac27d9de771928a43bdd199a90e6467548f2cccf6e3caa31e13cd2e8de21b5087bc048506edc4e5b0159810902f35413d2c5c5e3089df04b6b382d57f7cda
-EBUILD perf-5.15-r1.ebuild 7384 BLAKE2B 6dbab0d37c3e9058a8382b54d13a54e5c393fe9caae8d9b86e9d1af2e816442b4334ab53a31fca8b0e5df9baaf01766f19bc3f65f70f9dc2d492db4986a18f4c SHA512 33262ef0d7849178cd7e0c017d1ae724f16c2b4600cb52bd2e49f10e771fe15d28dd9a414aeed782cc8b590267ee72b4ef62121ff18e9399d3aad9cfba4e8693
+DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f
+EBUILD perf-5.15-r1.ebuild 7377 BLAKE2B bf92d4eb770c0914cf62a241d3f1d77c6c501650924a4c40badd7e132e94b88174453aeeda60ff2b9f11dafb3ea3c00342bced52075182ecaf240e4271a1cb4d SHA512 de08779d40cf32ba70654e88a7e06b829fe462247e6f0c7c8d9c626b997beb2366c048434e22955dfedb11637f791538f09a5d5f38b00b7fe9e807f1a6382599
+EBUILD perf-5.17.1.ebuild 7333 BLAKE2B d875f3553e4b54b4af9a5f56a0edd3ff7932763415447bcd08c0fa96f51309e93c7fd2ad725f68a3850acb9cd3cbeb9470ec4634bedaed3e228af5dc20c04a78 SHA512 d0ff31084203c1c1ee9b1ffe8d950f3a0b6d8682413f5537c289e657eed5545b23838a2dc96e4dc59558093f9e443b3b88c18e44a318ceddbfefcf4ecd09e07f
 EBUILD perf-5.8.ebuild 6757 BLAKE2B 490ff9045ea6dae5b14aca9e91d322d0e6d7879f2efd4bf9a4f2e919569b752e9933ba8be586f7615e81a04be28ffb5a5ca832a7491df13cfa6e67ddaf8ad86a SHA512 da92c2600d4033fedefad6e1f73a56261f2bb3b38b3a0c0fb195347d20509b8f3797386a75f52faab5981622e85db9e38cae805fcb8a86a1d2ce6916e95f5b76
 MISC metadata.xml 1732 BLAKE2B e14f57991fca666b493d129c62f779b9889e6afbd56e32dbbdcdef223b3a5c9060028613c1e6f69dfa03b35fa34570150d03f823479dff3bb9dacaebad7fc1d4 SHA512 cdd9adc6c226b902520f5f55f93217319733295b2696d73be45652e478a7c0354b24b676eb5b3b00824df1c09b80a6658282df0104101668ef4ee7b24190b24f
diff --git a/dev-util/perf/files/perf-5.17.1-clang.patch b/dev-util/perf/files/perf-5.17.1-clang.patch
new file mode 100644
index 000000000000..73d4506146c0
--- /dev/null
+++ b/dev-util/perf/files/perf-5.17.1-clang.patch
@@ -0,0 +1,61 @@
+
+Fix building against LLVM/Clang with monolithic libraries and
+adjust header includes for Clang >= 14.
+
+--- a/tools/build/feature/Makefile
++++ b/tools/build/feature/Makefile
+@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin:
+ 	$(BUILDXX) -std=gnu++14 				\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+-		$(shell $(LLVM_CONFIG) --libs Core BPF)		\
++		$(shell $(LLVM_CONFIG) --libs)			\
+ 		$(shell $(LLVM_CONFIG) --system-libs)		\
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+@@ -312,10 +312,7 @@ $(OUTPUT)test-clang.bin:
+ 	$(BUILDXX) -std=gnu++14					\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+-		-Wl,--start-group -lclangBasic -lclangDriver	\
+-		  -lclangFrontend -lclangEdit -lclangLex	\
+-		  -lclangAST -Wl,--end-group 			\
+-		$(shell $(LLVM_CONFIG) --libs Core option)	\
++		-lclang-cpp $(shell $(LLVM_CONFIG) --libs)	\
+ 		$(shell $(LLVM_CONFIG) --system-libs)		\
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+--- a/tools/perf/Makefile.perf
++++ b/tools/perf/Makefile.perf
+@@ -417,14 +417,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS))
+ LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
+ 
+ ifeq ($(USE_CLANG), 1)
+-  CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization
+-  CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l))
+-  LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so))
+-  LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group
++  LIBS += -lclang-cpp
+ endif
+ 
+ ifeq ($(USE_LLVM), 1)
+-  LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs)
++  LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs)
+   LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM)
+ endif
+ 
+--- a/tools/perf/util/c++/clang.cpp
++++ b/tools/perf/util/c++/clang.cpp
+@@ -20,7 +20,11 @@
+ #include "llvm/Option/Option.h"
+ #include "llvm/Support/FileSystem.h"
+ #include "llvm/Support/ManagedStatic.h"
++#if CLANG_VERSION_MAJOR >= 14
++#include "llvm/MC/TargetRegistry.h"
++#else
+ #include "llvm/Support/TargetRegistry.h"
++#endif
+ #include "llvm/Support/TargetSelect.h"
+ #include "llvm/Target/TargetMachine.h"
+ #include "llvm/Target/TargetOptions.h"
+
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index d3d3cab43544..e84ed5803f1a 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
 HOMEPAGE="https://perf.wiki.kernel.org/"
diff --git a/dev-util/perf/perf-5.12-r1.ebuild b/dev-util/perf/perf-5.17.1.ebuild
index 3d3079203e9d..a2e565d93fcb 100644
--- a/dev-util/perf/perf-5.12-r1.ebuild
+++ b/dev-util/perf/perf-5.17.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
 HOMEPAGE="https://perf.wiki.kernel.org/"
@@ -54,8 +54,8 @@ RDEPEND="audit? ( sys-process/audit )
 	babeltrace? ( dev-util/babeltrace )
 	crypt? ( virtual/libcrypt:= )
 	clang? (
-		<sys-devel/clang-10:*
-		<sys-devel/llvm-10:*
+		sys-devel/clang:=
+		sys-devel/llvm:=
 	)
 	gtk? ( x11-libs/gtk+:2 )
 	java? ( virtual/jre:* )
@@ -83,8 +83,8 @@ S="${S_K}/tools/perf"
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
 QA_FLAGS_IGNORED=(
-	usr/bin/perf-read-vdso32 # not linked with anything except for libc
-	usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed
+	'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+	'usr/libexec/perf-core/dlfilters/.*' # plugins
 )
 
 pkg_pretend() {
@@ -96,7 +96,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+	use clang && llvm_pkg_setup
 	# We enable python unconditionally as libbpf always generates
 	# API headers using python script
 	python_setup
@@ -141,6 +141,10 @@ src_prepare() {
 		popd || die
 	fi
 
+	pushd "${S_K}" >/dev/null || die
+	eapply "${FILESDIR}"/${P}-clang.patch
+	popd || die
+
 	# Drop some upstream too-developer-oriented flags and fix the
 	# Makefile in general
 	sed -i \
@@ -156,11 +160,6 @@ src_prepare() {
 
 	# The code likes to compile local assembly files which lack ELF markings.
 	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-
-	# Fix shebang to use python from prefix
-	if [[ -n "${EPREFIX}" ]]; then
-		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
-	fi
 }
 
 puse() { usex $1 "" no; }
@@ -222,9 +221,7 @@ perf_make() {
 src_compile() {
 	# test-clang.bin not build with g++
 	if use clang; then
-		pushd "${S_K}/tools/build/feature/" || die
-		make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
-		popd
+		make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
 	fi
 	perf_make -f Makefile.perf
 	use doc && perf_make -C Documentation man