[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     6e558b55644cc9cc496b3f9859ec3c2b3a619471
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 07:00:07 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 11:11:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e558b55

x11-drivers/nvidia-drivers: attempt fatal GCC_PLUGINS warning

Seen a user miss the warning and wondering why it didn't just
die for attention. Was formerly worried it may die when it
shouldn't, but the exact string check makes that unlikely.

Fairly rare that this is an issue nowadays though, GCC_PLUGINS
are typically not actually in-use and so errors don't happen
(check won't trigger then either).

Test isn't perfect, doesn't consider some configurations
(just informational, so not very important), but still fix
with -native-symlinks while here.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild    | 9 +++++----
 x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild | 9 +++++----
 x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild | 9 +++++----
 x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild  | 9 +++++----
 x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild  | 9 +++++----
 x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild  | 9 +++++----
 6 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index a11919a78e4e..9257ed94a9b4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -255,12 +255,13 @@ src_compile() {
 			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
 			:> "${T}"/plugin-test/test.c || die
 			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
-				HOSTCC="$(tc-getBUILD_CC)" M="${T}"/plugin-test 2>&1) \
+				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
 				=~ "error: incompatible gcc/plugin version" ]]
 			then
-				ewarn "Warning: detected kernel was built with different gcc/plugin versions,"
-				ewarn "you may need to 'make clean' and rebuild your kernel with the current"
-				ewarn "gcc version (or re-emerge for distribution kernels, including kernel-bin)."
+				eerror "Detected kernel was built with a different gcc/plugin version,"
+				eerror "Please 'make clean' and rebuild your kernel with the current"
+				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
+				die "kernel ${KV_FULL} needs to be rebuilt"
 			fi
 		fi
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild
index 3d9b38865127..2f90ba9654fe 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild
@@ -257,12 +257,13 @@ src_compile() {
 			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
 			:> "${T}"/plugin-test/test.c || die
 			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
-				HOSTCC="$(tc-getBUILD_CC)" M="${T}"/plugin-test 2>&1) \
+				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
 				=~ "error: incompatible gcc/plugin version" ]]
 			then
-				ewarn "Warning: detected kernel was built with different gcc/plugin versions,"
-				ewarn "you may need to 'make clean' and rebuild your kernel with the current"
-				ewarn "gcc version (or re-emerge for distribution kernels, including kernel-bin)."
+				eerror "Detected kernel was built with a different gcc/plugin version,"
+				eerror "Please 'make clean' and rebuild your kernel with the current"
+				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
+				die "kernel ${KV_FULL} needs to be rebuilt"
 			fi
 		fi
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild
index 7b5d31e0e448..d1b90da591b3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild
@@ -261,12 +261,13 @@ src_compile() {
 			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
 			:> "${T}"/plugin-test/test.c || die
 			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
-				HOSTCC="$(tc-getBUILD_CC)" M="${T}"/plugin-test 2>&1) \
+				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
 				=~ "error: incompatible gcc/plugin version" ]]
 			then
-				ewarn "Warning: detected kernel was built with different gcc/plugin versions,"
-				ewarn "you may need to 'make clean' and rebuild your kernel with the current"
-				ewarn "gcc version (or re-emerge for distribution kernels, including kernel-bin)."
+				eerror "Detected kernel was built with a different gcc/plugin version,"
+				eerror "Please 'make clean' and rebuild your kernel with the current"
+				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
+				die "kernel ${KV_FULL} needs to be rebuilt"
 			fi
 		fi
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild
index 8a3fe05070aa..7cb7cee88bbe 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild
@@ -287,12 +287,13 @@ src_compile() {
 			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
 			:> "${T}"/plugin-test/test.c || die
 			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
-				HOSTCC="$(tc-getBUILD_CC)" M="${T}"/plugin-test 2>&1) \
+				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
 				=~ "error: incompatible gcc/plugin version" ]]
 			then
-				ewarn "Warning: detected kernel was built with different gcc/plugin versions,"
-				ewarn "you may need to 'make clean' and rebuild your kernel with the current"
-				ewarn "gcc version (or re-emerge for distribution kernels, including kernel-bin)."
+				eerror "Detected kernel was built with a different gcc/plugin version,"
+				eerror "Please 'make clean' and rebuild your kernel with the current"
+				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
+				die "kernel ${KV_FULL} needs to be rebuilt"
 			fi
 		fi
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild
index 6eacd648125b..30fa4541ebe3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.04.ebuild
@@ -284,12 +284,13 @@ src_compile() {
 			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
 			:> "${T}"/plugin-test/test.c || die
 			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
-				HOSTCC="$(tc-getBUILD_CC)" M="${T}"/plugin-test 2>&1) \
+				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
 				=~ "error: incompatible gcc/plugin version" ]]
 			then
-				ewarn "Warning: detected kernel was built with different gcc/plugin versions,"
-				ewarn "you may need to 'make clean' and rebuild your kernel with the current"
-				ewarn "gcc version (or re-emerge for distribution kernels, including kernel-bin)."
+				eerror "Detected kernel was built with a different gcc/plugin version,"
+				eerror "Please 'make clean' and rebuild your kernel with the current"
+				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
+				die "kernel ${KV_FULL} needs to be rebuilt"
 			fi
 		fi
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild
index 94ee75c658a2..5238f7c81ae7 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.60.13.ebuild
@@ -283,12 +283,13 @@ src_compile() {
 			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
 			:> "${T}"/plugin-test/test.c || die
 			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
-				HOSTCC="$(tc-getBUILD_CC)" M="${T}"/plugin-test 2>&1) \
+				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
 				=~ "error: incompatible gcc/plugin version" ]]
 			then
-				ewarn "Warning: detected kernel was built with different gcc/plugin versions,"
-				ewarn "you may need to 'make clean' and rebuild your kernel with the current"
-				ewarn "gcc version (or re-emerge for distribution kernels, including kernel-bin)."
+				eerror "Detected kernel was built with a different gcc/plugin version,"
+				eerror "Please 'make clean' and rebuild your kernel with the current"
+				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
+				die "kernel ${KV_FULL} needs to be rebuilt"
 			fi
 		fi