/[gentoo-x86]/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-builddir-config.patch
Gentoo

Contents of /x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-builddir-config.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Feb 12 04:40:01 2013 UTC (17 months, 2 weeks 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 .config file is found in the output dir, not the source dir.
2 search for it in the right place to fix kernels that are built
3 via standard out-of-tree methods (KBUILD_OUTPUT).
4
5 --- a/kernel/conftest.sh
6 +++ b/kernel/conftest.sh
7 @@ -63,7 +63,7 @@ test_xen() {
8 XEN_PRESENT=0
9 fi
10 else
11 - CONFIG=$HEADERS/../.config
12 + CONFIG=$OUTPUT/.config
13 if [ -f $CONFIG ]; then
14 if [ -z "$(grep "^CONFIG_XEN=y" $CONFIG)" ]; then
15 XEN_PRESENT="0"
16 @@ -1688,7 +1688,7 @@ case "$6" in
17 rm -f conftest.h
18 else
19 MAKEFILE=$HEADERS/../Makefile
20 - CONFIG=$HEADERS/../.config
21 + CONFIG=$OUTPUT/.config
22
23 if [ -f $MAKEFILE -a -f $CONFIG ]; then
24 #
25 @@ -1857,7 +1857,7 @@ case "$6" in
26 rm -f conftest$$.c conftest$$.o
27 rm -f conftest.h
28 else
29 - CONFIG=$HEADERS/../.config
30 + CONFIG=$OUTPUT/.config
31 if [ -f $CONFIG ]; then
32 if [ -z "$(grep "^CONFIG_FB_RIVA=y" $CONFIG)" ]; then
33 RET=0
34 @@ -1923,7 +1923,7 @@ case "$6" in
35 rm -f conftest$$.c conftest$$.o
36 rm -f conftest.h
37 else
38 - CONFIG=$HEADERS/../.config
39 + CONFIG=$OUTPUT/.config
40 if [ -f $CONFIG ]; then
41 if [ -z "$(grep "^CONFIG_FB_NVIDIA=y" $CONFIG)" ]; then
42 RET=0

  ViewVC Help
Powered by ViewVC 1.1.20