From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51531158094 for ; Fri, 23 Sep 2022 02:05:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B988E0B28; Fri, 23 Sep 2022 02:05:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D947E0B28 for ; Fri, 23 Sep 2022 02:05:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55831340ADB for ; Fri, 23 Sep 2022 02:05:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74A335E3 for ; Fri, 23 Sep 2022 02:05:15 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1663898696.7284a2f263a760c8b79254e382a9a95ab935df94.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/files/ x11-drivers/nvidia-drivers/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 7284a2f263a760c8b79254e382a9a95ab935df94 X-VCS-Branch: master Date: Fri, 23 Sep 2022 02:05:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 593c475a-b0cf-476d-8cac-4eb382bcc1a1 X-Archives-Hash: f7f3544f746d5221d45e337441c54f8e commit: 7284a2f263a760c8b79254e382a9a95ab935df94 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Sep 23 01:54:19 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Sep 23 02:04:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7284a2f2 x11-drivers/nvidia-drivers: fix clang15 patch for x86 Oops, differs given x86 dropped support for the uvm module. Signed-off-by: Ionen Wolkens gentoo.org> .../files/nvidia-drivers-390.154-clang15-x86.patch | 28 ++++++++++++++++++++++ .../nvidia-drivers/nvidia-drivers-390.154.ebuild | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) 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)