diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-02-17 20:04:58 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-02-17 20:04:58 +0000 |
| commit | fb33c4bffe861d334cb77e97ec2bca260419604b (patch) | |
| tree | 457e4fe1215f3b0263fa31ce91b88468afdefd9c /x11-drivers | |
| parent | Version bump. (diff) | |
| download | gentoo-2-fb33c4bffe861d334cb77e97ec2bca260419604b.tar.gz gentoo-2-fb33c4bffe861d334cb77e97ec2bca260419604b.tar.bz2 gentoo-2-fb33c4bffe861d334cb77e97ec2bca260419604b.zip | |
Set up MODULE_NAMES so that nvidia-uvm gets built first (bug #501540).
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild) | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 5f1d63b25f21..853884c4d686 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.526 2014/02/17 14:11:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.527 2014/02/17 20:04:58 jer Exp $ + +*nvidia-drivers-334.16-r6 (17 Feb 2014) + + 17 Feb 2014; Jeroen Roovers <jer@gentoo.org> + -nvidia-drivers-334.16-r5.ebuild, +nvidia-drivers-334.16-r6.ebuild: + Set up MODULE_NAMES so that nvidia-uvm gets built first (bug #501540). 17 Feb 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-334.16-r5.ebuild: Invert if/else. diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild index 8112ca491cda..e9061ec75ea2 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild,v 1.3 2014/02/17 14:11:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild,v 1.1 2014/02/17 20:04:58 jer Exp $ EAPI=5 @@ -115,9 +115,12 @@ pkg_setup() { export CCACHE_DISABLE=1 if use kernel_linux; then - linux-mod_pkg_setup - MODULE_NAMES="nvidia(video:${S}/kernel)" - use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)" + # Because of awkward limitations of linux-mod.eclass, the order in + # which the modules are listed somehow affects module dependencies, + # so we list nvidia-uvm first and then nvidia. + use uvm && MODULE_NAMES="nvidia-uvm(video:${S}/kernel/uvm)" + MODULE_NAMES+=" nvidia(video:${S}/kernel)" + BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)" # linux-mod_src_compile calls set_arch_to_kernel, which @@ -125,6 +128,7 @@ pkg_setup() { # expects x86_64 or i386 and then converts it to x86 # later on in the build process BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')" + linux-mod_pkg_setup fi # set variables to where files are in the package structure @@ -186,8 +190,6 @@ src_compile() { # on FreeBSD there's one and triggers the kernel module build, as we install # it by itself, pass this. - use uvm && append-cppflags -DNV_UVM_ENABLE -DNVIDIA_UVM_LITE_ENABLED - cd "${NV_SRC}" if use kernel_FreeBSD; then MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ |