diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2025-02-05 14:15:45 -0500 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2025-02-05 14:21:27 -0500 |
| commit | 6c475cf326ab8df701b4e11e299f510a490c5cae (patch) | |
| tree | a0428fb05d2df4a56bae61ad8b1d5f3e8f26adb4 /x11-drivers | |
| parent | net-misc/nx: fix compilation with gcc14 for 32bit systems (diff) | |
| download | gentoo-6c475cf326ab8df701b4e11e299f510a490c5cae.tar.gz gentoo-6c475cf326ab8df701b4e11e299f510a490c5cae.tar.bz2 gentoo-6c475cf326ab8df701b4e11e299f510a490c5cae.zip | |
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 <ionen@gentoo.org>
Diffstat (limited to 'x11-drivers')
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} |