r1479 - in packages/branches/nexuiz/nexuiz-2.0/debian: . patches

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2006-09-04 08:40:06 +0000 (Mon, 04 Sep 2006)
New Revision: 1479

Added:
   packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_binary_on_amd64_with_latest_gcc.dpatch
Modified:
   packages/branches/nexuiz/nexuiz-2.0/debian/changelog
   packages/branches/nexuiz/nexuiz-2.0/debian/control
   packages/branches/nexuiz/nexuiz-2.0/debian/patches/00list
   packages/branches/nexuiz/nexuiz-2.0/debian/rules
Log:
workaround for gcc 4.1 on amd64

Modified: packages/branches/nexuiz/nexuiz-2.0/debian/changelog
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/changelog	2006-09-04 08:39:23 UTC (rev 1478)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/changelog	2006-09-04 08:40:06 UTC (rev 1479)
@@ -1,3 +1,11 @@
+nexuiz (2.0-3) UNRELEASED; urgency=low
+
+  [ Bruno "Fuddl" Kleinert ]
+  * Worked around broken binaries on amd64 built with GCC 4.1 (Closes: #385850).
+  * Removed build dependency on gcc-4.1
+
+ -- Bruno "Fuddl" Kleinert <fuddl at gmx.de>  Mon, 04 Sep 2006 10:38:37 +0200
+
 nexuiz (2.0-2) unstable; urgency=low
 
   [ Bruno "Fuddl" Kleinert ]

Modified: packages/branches/nexuiz/nexuiz-2.0/debian/control
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/control	2006-09-04 08:39:23 UTC (rev 1478)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/control	2006-09-04 08:40:06 UTC (rev 1479)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl at gmx.de>
-Build-Depends: debhelper (>= 4.0.0), libsdl1.2-dev, sharutils, imagemagick, gcc-4.0, dpatch
+Build-Depends: debhelper (>= 4.0.0), libsdl1.2-dev, sharutils, imagemagick, dpatch
 Standards-Version: 3.7.2
 
 Package: nexuiz

Modified: packages/branches/nexuiz/nexuiz-2.0/debian/patches/00list
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/patches/00list	2006-09-04 08:39:23 UTC (rev 1478)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/patches/00list	2006-09-04 08:40:06 UTC (rev 1479)
@@ -1 +1,2 @@
 10_fix_crash_after_screenshot.dpatch
+10_fix_binary_on_amd64_with_latest_gcc.dpatch

Added: packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_binary_on_amd64_with_latest_gcc.dpatch
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_binary_on_amd64_with_latest_gcc.dpatch	                        (rev 0)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_binary_on_amd64_with_latest_gcc.dpatch	2006-09-04 08:40:06 UTC (rev 1479)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_binary_on_amd64_with_latest_gcc.dpatch by  <fuddl at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Not a real fix, just a workaround to make the nexuiz binar run on
+## amd64, when compiled with gcc-4.1
+
+ at DPATCH@
+diff -urNad nexuiz-2.0~/darkplaces/makefile.inc nexuiz-2.0/darkplaces/makefile.inc
+--- nexuiz-2.0~/darkplaces/makefile.inc	2006-06-13 11:26:04.000000000 +0200
++++ nexuiz-2.0/darkplaces/makefile.inc	2006-09-04 10:19:38.301676500 +0200
+@@ -143,7 +143,7 @@
+ CFLAGS_RELEASE=
+ 
+ OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
+-OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
++OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
+ 
+ DO_CC=$(CC) $(CFLAGS) -c $< -o $@
+ 


Property changes on: packages/branches/nexuiz/nexuiz-2.0/debian/patches/10_fix_binary_on_amd64_with_latest_gcc.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/branches/nexuiz/nexuiz-2.0/debian/rules
===================================================================
--- packages/branches/nexuiz/nexuiz-2.0/debian/rules	2006-09-04 08:39:23 UTC (rev 1478)
+++ packages/branches/nexuiz/nexuiz-2.0/debian/rules	2006-09-04 08:40:06 UTC (rev 1479)
@@ -11,7 +11,7 @@
 build: patch-stamp build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	cd darkplaces && $(MAKE) CC=gcc-4.0 sdl-nexuiz sv-nexuiz
+	cd darkplaces && $(MAKE) sdl-nexuiz sv-nexuiz
 	touch build-stamp
 
 clean: unpatch