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

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

commit:     6a9174554448aa4f7ec724d09b1b31d115e6063f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 20 16:12:56 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 20 16:30:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a917455

x11-drivers/nvidia-drivers: workaround clang-common-17 sandbox issue

Most kernel modules do not seem affected and it depends on the tests
being performed, so workaround at least here while being looked at.

Issue could affect other packages if they happen to e.g. cd / (for
some reason) and use clang in certain ways for some tests, but likely
not a widespread problem.

Fortunately does not actually write these a.out and can get away
with just addpredict (kept clang-only not to shadow issues).

Bug: https://bugs.gentoo.org/914468
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild    | 4 ++++
 x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild | 4 ++++
 x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild | 3 +++
 x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild | 3 +++
 x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild  | 3 +++
 5 files changed, 17 insertions(+)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index 5319b38d5e48..fce832416735 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -159,6 +159,10 @@ src_compile() {
 		SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 	)
 
+	# temporary workaround for bug #914468
+	use modules &&
+		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
+
 	linux-mod-r1_src_compile
 
 	if use persistenced; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
index f2a6c2f42703..59cdea3c4d44 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
@@ -160,6 +160,10 @@ src_compile() {
 		SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 	)
 
+	# temporary workaround for bug #914468
+	use modules &&
+		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
+
 	linux-mod-r1_src_compile
 	emake "${NV_ARGS[@]}" -C nvidia-modprobe
 	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
index 465f5147fa11..e413c8fb10fd 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
@@ -199,6 +199,9 @@ src_compile() {
 			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 		)
 
+		# temporary workaround for bug #914468
+		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
+
 		linux-mod-r1_src_compile
 		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
 	fi

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild
index 2b6792634211..a7401f2b31c2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild
@@ -199,6 +199,9 @@ src_compile() {
 			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 		)
 
+		# temporary workaround for bug #914468
+		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
+
 		linux-mod-r1_src_compile
 		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
 	fi

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild
index 7e093cca624a..51bc68ee6e30 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild
@@ -202,6 +202,9 @@ src_compile() {
 			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
 		)
 
+		# temporary workaround for bug #914468
+		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
+
 		linux-mod-r1_src_compile
 		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
 	fi