/[gentoo-x86]/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.7+.patch
Gentoo

Contents of /x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.7+.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Feb 12 04:40:01 2013 UTC (19 months, 1 week ago) by vapier
Branch: MAIN
Fix building with kernels that split obj & src dirs.  Fix building against linux-3.7+ #447566 by Martin Väth.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

1 the nvidia drivers are trying to test for version 2.6.6, but fail to take into
2 account the first digit. so 3.7.0+ ends up failing the test.
3
4 https://bugs.gentoo.org/447566
5
6 --- a/kernel/conftest.sh
7 +++ b/kernel/conftest.sh
8 @@ -1697,13 +1697,15 @@
9 # kernel older than 2.6.6, that's all we require to
10 # build the module.
11 #
12 + VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
13 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
14 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
15
16 - if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
17 + if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
18 + [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
19 -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
20 SELECTED_MAKEFILE=Makefile.kbuild
21 RET=0
22 fi
23 fi
24 fi

  ViewVC Help
Powered by ViewVC 1.1.20