[Pkg-fglrx-devel] r1555 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2016-01-05 10:16:47 +0000 (Tue, 05 Jan 2016)
New Revision: 1555

Added:
   fglrx-driver/trunk/debian/patches/13-gcc-4.9-force.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/patches/series
Log:
* Add patch 13-gcc-4.9-force and a dependency on gcc-4.9 to temporary
  workaround a ctash in fglrx if the module is built with gcc version 5.
  Closes: #809638

!!!!!! TODO !!!!!!!
Check if it realy works and if dkms.conf needs:
MAKE[0]="cd ${dkms_tree}/fglrx/#MODULE_VERSION#/build; sh make.sh --nohints --uname_r=$kernelver --norootcheck"




Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-12-31 10:44:50 UTC (rev 1554)
+++ fglrx-driver/trunk/debian/changelog	2016-01-05 10:16:47 UTC (rev 1555)
@@ -1,8 +1,11 @@
-fglrx-driver (1:15.9-4) UNRELEASED; urgency=medium
+fglrx-driver (1:15.9-4) UNRELEASED; urgency=high
 
   * Fix spelling error in long description.
   * Add patch 06-spelling-error-manpage to fix a spelling error in atieventsd
     manpage.
+  * Add patch 13-gcc-4.9-force and a dependency on gcc-4.9 to temporary
+    workaround a ctash in fglrx if the module is built with gcc version 5.
+    Closes: #809638
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 31 Dec 2015 11:29:25 +0100
 

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2015-12-31 10:44:50 UTC (rev 1554)
+++ fglrx-driver/trunk/debian/control	2016-01-05 10:16:47 UTC (rev 1555)
@@ -189,6 +189,7 @@
 Architecture: i386 amd64
 Depends:
  dkms (>= 2.1),
+ gcc-4.9,
  ${misc:Depends}
 Suggests:
  ${fglrx}-driver,
@@ -220,6 +221,7 @@
 Depends:
  debhelper (>= 8),
  make,
+ gcc-4.9,
  bzip2,
  ${misc:Depends}
 Recommends:

Added: fglrx-driver/trunk/debian/patches/13-gcc-4.9-force.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/13-gcc-4.9-force.patch	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/13-gcc-4.9-force.patch	2016-01-05 10:16:47 UTC (rev 1555)
@@ -0,0 +1,17 @@
+# Force gcc-4.9 usage to fix a crash of fglrx.
+# Closes: #809638
+
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/make.sh fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/make.sh
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/make.sh	2015-09-09 00:57:14.000000000 +0200
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/make.sh	2016-01-05 11:06:53.896592205 +0100
+@@ -56,8 +56,8 @@
+ }
+ 
+ if [ -z "${CC}" ]; then 
+-	CC=gcc
+-	set_GCC_version
++	CC=gcc-4.9
++	#set_GCC_version
+ fi
+ 
+ # ==============================================================

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2015-12-31 10:44:50 UTC (rev 1554)
+++ fglrx-driver/trunk/debian/patches/series	2016-01-05 10:16:47 UTC (rev 1555)
@@ -10,3 +10,4 @@
 10-4.2.0-build.copy_xregs_to_kernel.patch
 11-4.1.0-gpl-only.patch
 12-4.3.0-build.patch
+13-gcc-4.9-force.patch