gentoo auto-resync : 24:08:2022 - 08:47:15

5 files changed, 14 insertions, 13 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index e63c6a26180f..dd9169eb03f8 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
index 7e4a86d56756..4dd3eab3cd28 100644
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -21,7 +21,7 @@
 # phase rather than 'default'.
 
 # @ECLASS_VARIABLE: CMAKE_ECLASS
-# @DEPRECATED
+# @DEPRECATED: none
 # @DESCRIPTION:
 # Only "cmake" is supported.
 : ${CMAKE_ECLASS:=cmake}
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 7319326c7ad8..365741a6dddf 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -601,11 +601,20 @@ _test-flag-PROG() {
 	#
 	# We can add more selective detection of no-op flags via
 	# '-Werror=ignored-optimization-argument' and similar error options
-	# similar to what we are doing with '-Qunused-arguments'.
+	# or accept unused flags with '-Qunused-arguments' like we
+	# used to for bug #627474. Since we now invoke the linker
+	# for testing linker flags, unused argument warnings aren't
+	# ignored; linker flags may no longer be accepted in CFLAGS.
+	#
+	# However, warnings emitted by a compiler for a clean source
+	# can break feature detection by CMake or autoconf since
+	# many checks use -Werror internally. See e.g. bug #714742.
 	local cmdline=(
 		"${comp[@]}"
 		# Clang will warn about unknown gcc flags but exit 0.
 		# Need -Werror to force it to exit non-zero.
+		#
+		# See also bug #712488 and bug #714742.
 		-Werror
 		"$@"
 		# -x<lang> options need to go before first source file
@@ -614,16 +623,7 @@ _test-flag-PROG() {
 		"${test_in}" -o "${test_out}"
 	)
 
-	if ! "${cmdline[@]}" &>/dev/null; then
-		# -Werror makes clang bail out on unused arguments as well;
-		# try to add -Qunused-arguments to work-around that
-		# other compilers don't support it but then, it's failure like
-		# any other.
-		#
-		# See also bug #712488 and bug #714742.
-		cmdline+=( -Qunused-arguments )
-		"${cmdline[@]}" &>/dev/null
-	fi
+	"${cmdline[@]}" &>/dev/null
 }
 
 # @FUNCTION: test-flag-CC
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index fc66434cc6bf..f1f54358000c 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -317,6 +317,7 @@ python_setup() {
 
 	# fallback to the best installed impl.
 	# (reverse iteration over _PYTHON_SUPPORTED_IMPLS)
+	local i
 	for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do
 		local impl=${_PYTHON_SUPPORTED_IMPLS[i]}
 		# avoid checking EPYTHON twice
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 2fd5c70120e9..caa37bc54ae2 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -729,7 +729,7 @@ python_setup() {
 	fi
 
 	# (reverse iteration -- newest impl first)
-	local found
+	local found i
 	_python_verify_patterns "${@}"
 	for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do
 		local impl=${_PYTHON_SUPPORTED_IMPLS[i]}