x11-drivers/nvidia-drivers: Work around make bug

When calling `make -j(2+) clean module', sometimes the `module' target is
built before the `clean' target is built. Work around this by setting
BUILT_TARGET=module so that the `clean' target is never built.

Bug: https://bugs.gentoo.org/613578
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild
index 21995d6e6a05cf60e2123b929bd412702e47ba26..928ed785b265fa2fc0043665a9c7921f2a38c067 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild
@@ -199,7 +199,7 @@ src_compile() {
                MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
                        LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
        elif use kernel_linux; then
-               linux-mod_src_compile
+               BUILD_TARGETS=module linux-mod_src_compile
        fi
 
        if use tools; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
index 43e4ba38026451017273ed7a6f88bb8477ae9e7b..90b232bbe062c8ea0d081cb72945277478d0b5bb 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
@@ -215,7 +215,9 @@ src_compile() {
                MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
                        LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
        elif use driver && use kernel_linux; then
-               linux-mod_src_compile src="${KERNEL_DIR}" KERNELRELEASE="${KV_FULL}"
+               BUILD_TARGETS=module linux-mod_src_compile \
+                       KERNELRELEASE="${KV_FULL}" \
+                       src="${KERNEL_DIR}"
        fi
 
        if use tools; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-410.78.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-410.78.ebuild
index bc60b06d1f53c53b761b95e0deb25d703ec56e62..70640f2e1c67149d4d30e3f175dabca687baa006 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-410.78.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-410.78.ebuild
@@ -208,7 +208,9 @@ src_compile() {
                MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
                        LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
        elif use driver && use kernel_linux; then
-               linux-mod_src_compile src="${KERNEL_DIR}" KERNELRELEASE="${KV_FULL}"
+               BUILD_TARGETS=module linux-mod_src_compile \
+                       KERNELRELEASE="${KV_FULL}" \
+                       src="${KERNEL_DIR}"
        fi
 
        if use tools; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.18.ebuild
index 94dbad47e363ab345a98c23f3f6ac561e9f686c2..e9f557b9387c80e63b397cde7f3fad7d370295b5 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.18.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-415.18.ebuild
@@ -208,7 +208,9 @@ src_compile() {
                MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
                        LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
        elif use driver && use kernel_linux; then
-               linux-mod_src_compile src="${KERNEL_DIR}" KERNELRELEASE="${KV_FULL}"
+               BUILD_TARGETS=module linux-mod_src_compile \
+                       KERNELRELEASE="${KV_FULL}" \
+                       src="${KERNEL_DIR}"
        fi
 
        if use tools; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.23.ebuild
index a66b634fe1934e325c42aaff834f78f773e36079..86b6c9565d931ea6fe81637770456f6be8b37f58 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.23.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-415.23.ebuild
@@ -208,7 +208,9 @@ src_compile() {
                MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
                        LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
        elif use driver && use kernel_linux; then
-               linux-mod_src_compile src="${KERNEL_DIR}" KERNELRELEASE="${KV_FULL}"
+               BUILD_TARGETS=module linux-mod_src_compile \
+                       KERNELRELEASE="${KV_FULL}" \
+                       src="${KERNEL_DIR}"
        fi
 
        if use tools; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
index a66b634fe1934e325c42aaff834f78f773e36079..86b6c9565d931ea6fe81637770456f6be8b37f58 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
@@ -208,7 +208,9 @@ src_compile() {
                MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
                        LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
        elif use driver && use kernel_linux; then
-               linux-mod_src_compile src="${KERNEL_DIR}" KERNELRELEASE="${KV_FULL}"
+               BUILD_TARGETS=module linux-mod_src_compile \
+                       KERNELRELEASE="${KV_FULL}" \
+                       src="${KERNEL_DIR}"
        fi
 
        if use tools; then