Fix bug #283572 (add a check for CONFIG_LOCKDEP).

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

3 files changed, 27 insertions, 7 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index e58aff1e6124..b8f966c96e70 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.172 2009/09/26 18:48:10 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.173 2009/09/26 19:11:52 spock Exp $
+
+  26 Sep 2009; Michał Januszewski <spock@gentoo.org>
+  nvidia-drivers-190.32.ebuild:
+  Fix bug #283572 (add a check for CONFIG_LOCKDEP).
 
   26 Sep 2009; Michał Januszewski <spock@gentoo.org>
   nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.32.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 019f715b359f..51c65f14a3ef 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -67,18 +67,18 @@ EBUILD nvidia-drivers-185.18.29.ebuild 16848 RMD160 663b782ed23d9bcf25d444c74302
 EBUILD nvidia-drivers-185.18.31.ebuild 17089 RMD160 f505126c0cf5ca4bdf6ec55cb82220457b6d72df SHA1 261bac63f262fd03980ada3d0ebf62da23b49501 SHA256 ecf0b6ccc573fddf8395a0fd8d2ca1d12daf0585f1677255aa5e09f5ccf93d67
 EBUILD nvidia-drivers-190.18.ebuild 16323 RMD160 04c3652de439f9d30554a4e402422d0c4c3b33ee SHA1 863411ca27a0700cdeb9ac7aebbba7c647d5d1d6 SHA256 244872967960e1a71a43073357362e7697d16225f18d5d422d03a6e75f41c32c
 EBUILD nvidia-drivers-190.25.ebuild 16322 RMD160 ed260b5504248c6403b55bba388a040521da7911 SHA1 39624eb75105bea4e1eb8905244cf092e8050952 SHA256 ae8340d3b1389cd6ff4894f9b4bf902cb82bad50dfc693685ee6ae7b1bebce05
-EBUILD nvidia-drivers-190.32.ebuild 17214 RMD160 0f43715ed2328d31b17e82246a64e36d4dde4b47 SHA1 9ce3fda53293f076c1a5236f9292c34a4d796662 SHA256 25443138f680bea00fbee534469192762723e07d0ef5728e9d02cf5298a27a16
+EBUILD nvidia-drivers-190.32.ebuild 17847 RMD160 5c148dd6a7819ca716c6b764d6d789ddaecf27e5 SHA1 30b2b9749957d361a48492845d925e7092d4c1fe SHA256 7432d1b5da702b0c0038411f1023990a9942610fb57e89245716561ba11d8d69
 EBUILD nvidia-drivers-71.86.09.ebuild 14200 RMD160 1208de3e64a596b6a464e4e979f28a6f5d6490ea SHA1 6f842c11dbc3162bcbe677b31fb79c768d6bb037 SHA256 a0942d2961d8bcc28c42adbbac7bc270fe5c3e6d03adba0ba42e44fe377b5c5c
 EBUILD nvidia-drivers-71.86.11.ebuild 14197 RMD160 e63d489ae1524810f2556c6f515856f7e5ce3813 SHA1 489180c36806b4238dc39cf84566c9351938c060 SHA256 6a4f31d5e46e023830e8908b456d3cb99fb8aa4ba2a8f84daa91497c63c5a708
 EBUILD nvidia-drivers-96.43.09.ebuild 14525 RMD160 4b99d2295e5f00081c8298a1dbf2838167d23510 SHA1 f50696adc9dd29bd9ea5baa3c4aa6f3252e1c43d SHA256 a16ddbacb31c494ab08ca5f98504c8e1aec7c513da0c0d4e3d0308a2c56237ca
 EBUILD nvidia-drivers-96.43.11.ebuild 14527 RMD160 8f6adaf8922b2b89c47f5d5a24cda85d35cf927b SHA1 c4896e8b739e1ebe43a6ade3c50a154eb1b292be SHA256 77645f44da6bb71791ec39976bd0d3967c58c811fb8a1b0f7975fa553d95b5d9
 EBUILD nvidia-drivers-96.43.13.ebuild 14523 RMD160 05c1abee2a37582d4c6a15a384ada627c872fffd SHA1 ccec82fdd34de6e6f1562a120257e9d68a6b6686 SHA256 2289a2cae34300952692fb7f9145bdd7f67f3bfe472fc569121436beacc0b3be
-MISC ChangeLog 38840 RMD160 0462be5dc08f7c707997aa615389914c990b5ddf SHA1 81c885a4d5de574b35b030e5f327285c33f3d974 SHA256 bd6488956fec71a84b7bace2c61449b3a1f17515a218447a79d829fccd2e1fa5
+MISC ChangeLog 38979 RMD160 41157e0741546184433be75ac02275ad7f77cde2 SHA1 a7b006982383932450893aff96edd8e23b435f62 SHA256 f0f47008fc8fbd449ad4c1fdeb768f60f3491203158b53a42e45573bb94811b4
 MISC metadata.xml 608 RMD160 69923c951a3b11d3632338cd673430c1335f78cd SHA1 febe635634c122bf9fb5fd83fd486ab5a25282b3 SHA256 6b13dc244ff827b23a6f1de01eef3a7f607917573fb36b7316a1a629c78cc6bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEUEARECAAYFAkq+YewACgkQchej4aZK9/dj/gCY4rldoNXjhzOU2aqgpSoCJkLp
-1QCcCgwhgKQAH68NN1CUUZkQvHCkm5w=
-=Vt0N
+iEYEARECAAYFAkq+Z34ACgkQchej4aZK9/fROwCeOMZqrLwbC8LLQa5zXIDkih8b
+ndUAn3RiPKg+m6HR35cJuSuRDzGY/1Qx
+=yPFW
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild
index 6623e64fb482..8417eaaa83b1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -163,6 +163,21 @@ mtrr_check() {
 	fi
 }
 
+lockdep_check() {
+	if linux_chkconfig_present LOCKDEP; then
+		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
+		eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
+		eerror "which will prevent ${P} from compiling."
+		eerror "Please make sure the following options have been unset:"
+		eerror "    Kernel hacking  --->"
+		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
+		eerror "        [ ] Lock debugging: prove locking correctness"
+		eerror "        [ ] Lock usage statistics"
+		eerror "in 'menuconfig'"
+		die "LOCKDEP enabled"
+	fi
+}
+
 pkg_setup() {
 	# try to turn off distcc and ccache for people that have a problem with it
 	export DISTCC_DISABLE=1
@@ -179,6 +194,7 @@ pkg_setup() {
 		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
 		SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
 		mtrr_check
+		lockdep_check
 	fi
 
 	# On BSD userland it wants real make command