commit: 1a410b8ebbd51b3224de532922316e8a832b07f8 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Tue Dec 25 14:00:36 2018 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Tue Dec 25 14:03:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a410b8e
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 <AT> gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild | 4 +++- x11-drivers/nvidia-drivers/nvidia-drivers-410.78.ebuild | 4 +++- x11-drivers/nvidia-drivers/nvidia-drivers-415.18.ebuild | 4 +++- x11-drivers/nvidia-drivers/nvidia-drivers-415.23.ebuild | 4 +++- x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild | 4 +++- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild index 21995d6e6a0..928ed785b26 100644 --- 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 43e4ba38026..90b232bbe06 100644 --- 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 bc60b06d1f5..70640f2e1c6 100644 --- 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 94dbad47e36..e9f557b9387 100644 --- 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 a66b634fe19..86b6c9565d9 100644 --- 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 a66b634fe19..86b6c9565d9 100644 --- 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
