[pkg-nvidia-devel] r1130 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control module/debian/rules nvidia-kernel-dkms.dkms

[rra at users.alioth.debian.org]

Author: rra
Date: Mon Jun 14 02:51:10 2010
New Revision: 1130

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1130
Log:
Set CCACHE_DISABLE instead of conflicting with ccache

* Remove the conflicts with ccache in nvidia-kernel-source and
  nvidia-kernel-dkms and instead set CCACHE_DISABLE in the environment
  when doing a module build.  (Closes: #582748)

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/module/debian/rules
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.dkms

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1130&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon Jun 14 02:51:10 2010
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers (195.36.24-4) unstable; urgency=low
+
+  * Remove the conflicts with ccache in nvidia-kernel-source and
+    nvidia-kernel-dkms and instead set CCACHE_DISABLE in the environment
+    when doing a module build.  (Closes: #582748)
+
+ -- Russ Allbery <rra at debian.org>  Sun, 13 Jun 2010 19:50:11 -0700
+
 nvidia-graphics-drivers (195.36.24-3) unstable; urgency=low
 
   [ Russ Allbery ]

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1130&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Mon Jun 14 02:51:10 2010
@@ -105,8 +105,7 @@
  nvidia-kernel-legacy-71xx-dkms,
  nvidia-kernel-legacy-96xx-dkms,
  nvidia-kernel-legacy-173xx-dkms,
- binutils-gold (>> 2.20.51),
- ccache (<< 3.0~),
+ binutils-gold (>> 2.20.51)
 Description: NVIDIA binary kernel module DKMS source${nvidia:LegacyDesc}
  This package builds the NVIDIA Xorg binary kernel module needed by
  nvidia-glx${nvidia:Legacy}, using DKMS.
@@ -129,9 +128,7 @@
 Depends: ${misc:Depends}, debhelper (>= 7.2.3~), make, quilt (>= 0.46-7~)
 Recommends: module-assistant | kernel-package,
  nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version}), nvidia-kernel-common
-Conflicts:
- binutils-gold (>> 2.20.51),
- ccache (<< 3.0~),
+Conflicts: binutils-gold (>> 2.20.51)
 Description: NVIDIA binary kernel module source${nvidia:LegacyDesc}
  This package provides the source for the NVIDIA Xorg binary kernel module
  needed by nvidia-glx${nvidia:Legacy} in a form suitable

Modified: packages/nvidia-graphics-drivers/trunk/debian/module/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/module/debian/rules?rev=1130&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/module/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/module/debian/rules Mon Jun 14 02:51:10 2010
@@ -1,4 +1,8 @@
 #!/usr/bin/make -f
+
+# Disable ccache, which causes strange build failures with the module.
+# See Bug#582748.
+export CCACHE_DISABLE := 1
 
 CFLAGS = -Wall -g
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.dkms
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.dkms?rev=1130&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.dkms (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-dkms.dkms Mon Jun 14 02:51:10 2010
@@ -8,5 +8,6 @@
 DEST_MODULE_LOCATION[0]="/updates/dkms/"
 AUTOINSTALL=yes
 
-MAKE[0]="make -C . LINUXDIR=${kernel_source_dir} KVERREL=${kernelver}"
+MAKE[0]="env CCACHE_DISABLE=1 \
+    make -C . LINUXDIR=${kernel_source_dir} KVERREL=${kernelver}"
 CLEAN="make -C . LINUXDIR=${kernel_source_dir} KVERREL=${kernelver} clean"