From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3542158B20 for ; Wed, 05 Feb 2025 19:22:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D82BA342FE2 for ; Wed, 05 Feb 2025 19:22:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D55251103CB; Wed, 05 Feb 2025 19:22:26 +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 bobolink.gentoo.org (Postfix) with ESMTPS id CD7B61103CB for ; Wed, 05 Feb 2025 19:22:26 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 844E5342F9E for ; Wed, 05 Feb 2025 19:22:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F94D2195 for ; Wed, 05 Feb 2025 19:22:25 +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: <1738783287.6c475cf326ab8df701b4e11e299f510a490c5cae.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-550.40.83.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 6c475cf326ab8df701b4e11e299f510a490c5cae X-VCS-Branch: master Date: Wed, 05 Feb 2025 19:22:25 +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: 18a565a9-5c47-4f9f-b89a-26d8d9c210fd X-Archives-Hash: b8c166c422b409b464109097bc4046ae commit: 6c475cf326ab8df701b4e11e299f510a490c5cae Author: Ionen Wolkens gentoo org> AuthorDate: Wed Feb 5 19:15:45 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Feb 5 19:21:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c475cf3 x11-drivers/nvidia-drivers: simplify clang addpredict workaround Really no need to do this only with clang, and using CPP= relies on tc-is-clang internals and could break. Signed-off-by: Ionen Wolkens gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild | 5 ++--- x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild | 3 +-- x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-550.40.83.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild index d72f61e62a25..018c9b4d0b96 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -179,8 +179,7 @@ src_compile() { ) # temporary workaround for bug #914468 - use modules && - CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}" + use modules && addpredict "${KV_OUT_DIR}" linux-mod-r1_src_compile diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild index 1ac00d9739fb..7051b73f87eb 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild @@ -169,8 +169,7 @@ src_compile() { ) # temporary workaround for bug #914468 - use modules && - CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}" + use modules && addpredict "${KV_OUT_DIR}" linux-mod-r1_src_compile emake "${NV_ARGS[@]}" -C nvidia-modprobe diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild index 02fa367c93eb..4eb0119b3834 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild @@ -227,7 +227,7 @@ src_compile() { ) # temporary workaround for bug #914468 - CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}" + addpredict "${KV_OUT_DIR}" linux-mod-r1_src_compile CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild index 69d63203644f..58149501a27f 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild @@ -220,7 +220,7 @@ src_compile() { ) # temporary workaround for bug #914468 - CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}" + addpredict "${KV_OUT_DIR}" linux-mod-r1_src_compile CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.83.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.83.ebuild index f4e1b8c9ff17..95f15a1ddcbf 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.83.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.83.ebuild @@ -217,7 +217,7 @@ src_compile() { ) # temporary workaround for bug #914468 - CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}" + addpredict "${KV_OUT_DIR}" linux-mod-r1_src_compile CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild index 649f3eece71a..c37f3dc47e8c 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild @@ -226,7 +226,7 @@ src_compile() { ) # temporary workaround for bug #914468 - CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}" + addpredict "${KV_OUT_DIR}" linux-mod-r1_src_compile CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild index 0db7b26a4410..3847604073bf 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild @@ -230,7 +230,7 @@ src_compile() { ) # temporary workaround for bug #914468 - CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}" + addpredict "${KV_OUT_DIR}" linux-mod-r1_src_compile CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}