diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2022-09-22 21:54:19 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2022-09-22 22:04:56 -0400 |
| commit | 7284a2f263a760c8b79254e382a9a95ab935df94 (patch) | |
| tree | 844e08838fb09050dea50ac1cc80d055970ccf05 /x11-drivers | |
| parent | dev-ml/batteries: bump to 3.5.1 (diff) | |
| download | gentoo-7284a2f263a760c8b79254e382a9a95ab935df94.tar.gz gentoo-7284a2f263a760c8b79254e382a9a95ab935df94.tar.bz2 gentoo-7284a2f263a760c8b79254e382a9a95ab935df94.zip | |
x11-drivers/nvidia-drivers: fix clang15 patch for x86
Oops, differs given x86 dropped support for the uvm module.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch | 28 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild | 3 |
2 files changed, 30 insertions, 1 deletions
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 new file mode 100644 index 000000000000..2038b3da157a --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch @@ -0,0 +1,28 @@ +Kernel's makefiles pass -Werror=strict-prototypes which +trigger errors with clang15+ +https://bugs.gentoo.org/870238 +--- a/kernel/nvidia/nvlink_linux.c ++++ b/kernel/nvidia/nvlink_linux.c +@@ -639 +639 @@ +-void * NVLINK_API_CALL nvlink_allocLock() ++void * NVLINK_API_CALL nvlink_allocLock(void) +--- a/kernel/nvidia/os-interface.c ++++ b/kernel/nvidia/os-interface.c +@@ -879 +879 @@ +-NV_STATUS NV_API_CALL os_flush_cpu_cache() ++NV_STATUS NV_API_CALL os_flush_cpu_cache(void) +@@ -886 +886 @@ +-NV_STATUS NV_API_CALL os_flush_cpu_cache_all() ++NV_STATUS NV_API_CALL os_flush_cpu_cache_all(void) +@@ -944 +944 @@ +-void NV_API_CALL os_flush_cpu_write_combine_buffer() ++void NV_API_CALL os_flush_cpu_write_combine_buffer(void) +@@ -1073 +1073 @@ +-NvU32 NV_API_CALL os_get_cpu_number() ++NvU32 NV_API_CALL os_get_cpu_number(void) +@@ -1080 +1080 @@ +-NvU32 NV_API_CALL os_get_cpu_count() ++NvU32 NV_API_CALL os_get_cpu_count(void) +@@ -1155 +1155 @@ +-void NV_API_CALL os_dump_stack() ++void NV_API_CALL os_dump_stack(void) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild index 14d1ff0122f7..7a9cab0fed5d 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild @@ -73,7 +73,6 @@ BDEPEND=" QA_PREBUILT="opt/bin/* usr/lib*" PATCHES=( - "${FILESDIR}"/nvidia-drivers-390.154-clang15.patch "${FILESDIR}"/nvidia-extras-390.154-clang16.patch "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.141-fno-common.patch @@ -152,6 +151,8 @@ src_prepare() { rm nvidia-settings && mv nvidia-settings{-${PV},} || die rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die + eapply "${FILESDIR}"/nvidia-drivers-390.154-clang15$(usev {,-}x86).patch + default # prevent detection of incomplete kernel DRM support (bug #603818) |