commit: ec717d8006b9e69a6171786a57731710cedf19dc Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Jun 18 01:42:42 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Jun 18 01:53:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec717d80
x11-drivers/nvidia-drivers: backport clang options fix to 525 branch Technically 0/390+470+515 also need this, but they have bigger issues with clang-16 and I can only recommend to not use clang with old branches. NVIDIA may update 470 for clang in the future though, the others are unlikely. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../nvidia-drivers-525.116.04-clang-unused-option.patch | 17 +++++++++++++++++ .../nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild | 1 + .../nvidia-drivers/nvidia-drivers-525.47.27.ebuild | 1 + 3 files changed, 19 insertions(+) diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.116.04-clang-unused-option.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.116.04-clang-unused-option.patch new file mode 100644 index 000000000000..5842bdd2a757 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-525.116.04-clang-unused-option.patch @@ -0,0 +1,17 @@ +clang-15.0.7(?) or so may abort when the unused option -MD is passed, +option removal is backported fro nvidia-535 branch + +Note patch is kept without context given the lines below change constantly +(version) preventing from applying same patch to multiple versions. + +https://github.com/NVIDIA/open-gpu-kernel-modules/issues/506 +--- a/kernel/Kbuild ++++ b/kernel/Kbuild +@@ -73 +73 @@ +-EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error -Wno-format-extra-args ++EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error -Wno-format-extra-args +--- a/kernel-module-source/kernel-open/Kbuild ++++ b/kernel-module-source/kernel-open/Kbuild +@@ -73 +73 @@ +-EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error -Wno-format-extra-args ++EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error -Wno-format-extra-args diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild index 2abd1c113768..d2462ba8997f 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild @@ -81,6 +81,7 @@ BDEPEND=" QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" PATCHES=( + "${FILESDIR}"/nvidia-drivers-525.116.04-clang-unused-option.patch "${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.144-desktop.patch diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.27.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.27.ebuild index 6b8d1b4212dc..eff4973c2be8 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.27.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.27.ebuild @@ -82,6 +82,7 @@ BDEPEND=" QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" PATCHES=( + "${FILESDIR}"/nvidia-drivers-525.116.04-clang-unused-option.patch "${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.144-desktop.patch