| 1 |
commit: 7284a2f263a760c8b79254e382a9a95ab935df94 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 23 01:54:19 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 23 02:04:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7284a2f2 |
| 7 |
|
| 8 |
x11-drivers/nvidia-drivers: fix clang15 patch for x86 |
| 9 |
|
| 10 |
Oops, differs given x86 dropped support for the uvm module. |
| 11 |
|
| 12 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/nvidia-drivers-390.154-clang15-x86.patch | 28 ++++++++++++++++++++++ |
| 15 |
.../nvidia-drivers/nvidia-drivers-390.154.ebuild | 3 ++- |
| 16 |
2 files changed, 30 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..2038b3da157a |
| 21 |
--- /dev/null |
| 22 |
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch |
| 23 |
@@ -0,0 +1,28 @@ |
| 24 |
+Kernel's makefiles pass -Werror=strict-prototypes which |
| 25 |
+trigger errors with clang15+ |
| 26 |
+https://bugs.gentoo.org/870238 |
| 27 |
+--- a/kernel/nvidia/nvlink_linux.c |
| 28 |
++++ b/kernel/nvidia/nvlink_linux.c |
| 29 |
+@@ -639 +639 @@ |
| 30 |
+-void * NVLINK_API_CALL nvlink_allocLock() |
| 31 |
++void * NVLINK_API_CALL nvlink_allocLock(void) |
| 32 |
+--- a/kernel/nvidia/os-interface.c |
| 33 |
++++ b/kernel/nvidia/os-interface.c |
| 34 |
+@@ -879 +879 @@ |
| 35 |
+-NV_STATUS NV_API_CALL os_flush_cpu_cache() |
| 36 |
++NV_STATUS NV_API_CALL os_flush_cpu_cache(void) |
| 37 |
+@@ -886 +886 @@ |
| 38 |
+-NV_STATUS NV_API_CALL os_flush_cpu_cache_all() |
| 39 |
++NV_STATUS NV_API_CALL os_flush_cpu_cache_all(void) |
| 40 |
+@@ -944 +944 @@ |
| 41 |
+-void NV_API_CALL os_flush_cpu_write_combine_buffer() |
| 42 |
++void NV_API_CALL os_flush_cpu_write_combine_buffer(void) |
| 43 |
+@@ -1073 +1073 @@ |
| 44 |
+-NvU32 NV_API_CALL os_get_cpu_number() |
| 45 |
++NvU32 NV_API_CALL os_get_cpu_number(void) |
| 46 |
+@@ -1080 +1080 @@ |
| 47 |
+-NvU32 NV_API_CALL os_get_cpu_count() |
| 48 |
++NvU32 NV_API_CALL os_get_cpu_count(void) |
| 49 |
+@@ -1155 +1155 @@ |
| 50 |
+-void NV_API_CALL os_dump_stack() |
| 51 |
++void NV_API_CALL os_dump_stack(void) |
| 52 |
|
| 53 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild |
| 54 |
index 14d1ff0122f7..7a9cab0fed5d 100644 |
| 55 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild |
| 56 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild |
| 57 |
@@ -73,7 +73,6 @@ BDEPEND=" |
| 58 |
QA_PREBUILT="opt/bin/* usr/lib*" |
| 59 |
|
| 60 |
PATCHES=( |
| 61 |
- "${FILESDIR}"/nvidia-drivers-390.154-clang15.patch |
| 62 |
"${FILESDIR}"/nvidia-extras-390.154-clang16.patch |
| 63 |
"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch |
| 64 |
"${FILESDIR}"/nvidia-settings-390.141-fno-common.patch |
| 65 |
@@ -152,6 +151,8 @@ src_prepare() { |
| 66 |
rm nvidia-settings && mv nvidia-settings{-${PV},} || die |
| 67 |
rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die |
| 68 |
|
| 69 |
+ eapply "${FILESDIR}"/nvidia-drivers-390.154-clang15$(usev {,-}x86).patch |
| 70 |
+ |
| 71 |
default |
| 72 |
|
| 73 |
# prevent detection of incomplete kernel DRM support (bug #603818) |
Archives