summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-04-11 17:51:45 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-04-11 17:51:45 +0000
commit421f404f514ebf014a4b8c2e82312ef561a12865 (patch)
tree75ae547e6a8d2d7ab0eccebc80dba95e3cfae910 /x11-drivers
parentMark drivers that don't work with glibc 2.15 as depending on earlier versions... (diff)
downloadhistorical-421f404f514ebf014a4b8c2e82312ef561a12865.tar.gz
historical-421f404f514ebf014a4b8c2e82312ef561a12865.tar.bz2
historical-421f404f514ebf014a4b8c2e82312ef561a12865.zip
Fix 295.33 for Linux 3.3.x. bug #408841
Package-Manager: portage-2.1.10.56/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog5
-rw-r--r--x11-drivers/nvidia-drivers/Manifest4
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild7
3 files changed, 12 insertions, 4 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index a2d685420c87..1388d196ee58 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-drivers/nvidia-drivers
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.332 2012/04/11 17:48:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.333 2012/04/11 17:51:45 cardoe Exp $
+
+ 11 Apr 2012; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-295.33.ebuild:
+ Fix 295.33 for Linux 3.3.x. bug #408841
11 Apr 2012; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-290.10.ebuild,
nvidia-drivers-290.10-r2.ebuild, nvidia-drivers-295.20-r1.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index a3be01200601..0a88d3c43290 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -34,7 +34,7 @@ EBUILD nvidia-drivers-173.14.31.ebuild 15368 RMD160 93ab024561941795dda1c6a2a506
EBUILD nvidia-drivers-290.10-r2.ebuild 17634 RMD160 b7622700747478a2c2736d85e30dab244d4c4089 SHA1 dd63f5903acdf7bd91d5d1610d6a80546874e62f SHA256 6820c91c9fa66d3017d95ccd8836b6c837f0e06428a74d33c6c443e9e697b7d1
EBUILD nvidia-drivers-290.10.ebuild 17229 RMD160 5638271cc9a33df494db4031564b2d6a1acd52c3 SHA1 eea6e6f7d929bbdf7c8da3ce65d022eba71f6992 SHA256 4ae8bcb31a72588a7965dde833597c62386a6f36b1fbb4eb7d781c11304199dc
EBUILD nvidia-drivers-295.20-r1.ebuild 17817 RMD160 fa86ce3c58e739c0a7f0ebff8d2de1d5b9b79a7f SHA1 14e8fe9a78349840c64d7bacad13c7081fe165fb SHA256 817fb32916ef517d9bd66d86f6f40a2a995783f24f032bdd6b047ad57752523b
-EBUILD nvidia-drivers-295.33.ebuild 18165 RMD160 342bddcd843848348e292b33f8087f5eead717cf SHA1 14c67ae0b499dc51832d064c43cb73464e924d4d SHA256 09a48bcb86b164e1166ddfb5a451f4ff79dfad2c4f77f30e4b987fd7a60ee554
+EBUILD nvidia-drivers-295.33.ebuild 18349 RMD160 f6ec5e8ae1f5ccde10739852de05eaa9811e45bb SHA1 9bf8ed98100c4de86a7f31a60d170c62167bf1be SHA256 36a2b0e6542a50125de88d5417e55d8e1a7e61acfd3859b3b77499f12d9b6eb3
EBUILD nvidia-drivers-96.43.20.ebuild 15606 RMD160 021845276b0cdec4989351d430ce9dfb5034f3e4 SHA1 f9cd2e84e9ae4a9afffa439a1db1366058792e75 SHA256 7343d4e7ec6b4354efabe420ba6413e5e369fe6897eee51cbb3ae49b39d31b13
-MISC ChangeLog 71364 RMD160 e20b98219be0e3a437e70ebdb7915bd21914e034 SHA1 eefea9ddc69eed969fc21907e1f8172297b4f572 SHA256 bd3f36fd6b8f5da1069f03931f9fd0a8e1063384d9b45e88e531e4ffbff6fc5b
+MISC ChangeLog 71487 RMD160 10f0586bf57ddb76b3354fda681c932fddb4a9ef SHA1 19f0fcdd2c0976425f21622dc5985db381f41d91 SHA256 a5afca947c9c355b8c50b8f6bae2cadcfb3d3bb12499413ddb6b02d607b5ab7b
MISC metadata.xml 653 RMD160 29f9c8662d2c08a9c33921ef606bf7059a30752b SHA1 8653d3a29f241f09b6b377c74f3d6a50bad69bbb SHA256 0e645c5ff2f1726137be71aaabd6c2a661602aa3526ef0500892dbfd63f5c31b
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild
index c32e8417045f..d7f8d66c2a95 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild,v 1.4 2012/04/06 06:46:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild,v 1.5 2012/04/11 17:51:45 cardoe Exp $
EAPI="2"
@@ -288,6 +288,11 @@ src_prepare() {
-e 's:-Wsign-compare::g' \
"${NV_SRC}"/Makefile.kbuild
+ # Fix building with Linux 3.3.x wrt #408841
+ sed -i \
+ -e '/CFLAGS="$CFLAGS/s:-I$SOURCES/arch/x86/include:& -I$OUTPUT/arch/x86/include/generated:' \
+ kernel/conftest.sh || die
+
# If you set this then it's your own fault when stuff breaks :)
use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*