Gentoo Archives: gentoo-commits

From: "Michael Januszewski (spock)" <spock@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: ChangeLog nvidia-drivers-190.32.ebuild
Date: Sat, 26 Sep 2009 19:11:56
Message-Id: E1MrcgS-0002L4-Kz@stork.gentoo.org
1 spock 09/09/26 19:11:52
2
3 Modified: ChangeLog nvidia-drivers-190.32.ebuild
4 Log:
5 Fix bug #283572 (add a check for CONFIG_LOCKDEP).
6 (Portage version: 2.2_rc42/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.173 x11-drivers/nvidia-drivers/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.173&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.173&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?r1=1.172&r2=1.173
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v
18 retrieving revision 1.172
19 retrieving revision 1.173
20 diff -u -r1.172 -r1.173
21 --- ChangeLog 26 Sep 2009 18:48:10 -0000 1.172
22 +++ ChangeLog 26 Sep 2009 19:11:52 -0000 1.173
23 @@ -1,6 +1,10 @@
24 # ChangeLog for x11-drivers/nvidia-drivers
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.172 2009/09/26 18:48:10 spock Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.173 2009/09/26 19:11:52 spock Exp $
28 +
29 + 26 Sep 2009; Michał Januszewski <spock@g.o>
30 + nvidia-drivers-190.32.ebuild:
31 + Fix bug #283572 (add a check for CONFIG_LOCKDEP).
32
33 26 Sep 2009; Michał Januszewski <spock@g.o>
34 nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.32.ebuild:
35
36
37
38 1.3 x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild?rev=1.3&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild?rev=1.3&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild?r1=1.2&r2=1.3
43
44 Index: nvidia-drivers-190.32.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild,v
47 retrieving revision 1.2
48 retrieving revision 1.3
49 diff -u -r1.2 -r1.3
50 --- nvidia-drivers-190.32.ebuild 26 Sep 2009 18:48:10 -0000 1.2
51 +++ nvidia-drivers-190.32.ebuild 26 Sep 2009 19:11:52 -0000 1.3
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild,v 1.2 2009/09/26 18:48:10 spock Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild,v 1.3 2009/09/26 19:11:52 spock Exp $
57
58 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
59
60 @@ -163,6 +163,21 @@
61 fi
62 }
63
64 +lockdep_check() {
65 + if linux_chkconfig_present LOCKDEP; then
66 + eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
67 + eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
68 + eerror "which will prevent ${P} from compiling."
69 + eerror "Please make sure the following options have been unset:"
70 + eerror " Kernel hacking --->"
71 + eerror " [ ] Lock debugging: detect incorrect freeing of live locks"
72 + eerror " [ ] Lock debugging: prove locking correctness"
73 + eerror " [ ] Lock usage statistics"
74 + eerror "in 'menuconfig'"
75 + die "LOCKDEP enabled"
76 + fi
77 +}
78 +
79 pkg_setup() {
80 # try to turn off distcc and ccache for people that have a problem with it
81 export DISTCC_DISABLE=1
82 @@ -179,6 +194,7 @@
83 BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
84 SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
85 mtrr_check
86 + lockdep_check
87 fi
88
89 # On BSD userland it wants real make command