← Back to branch summary

~ubuntu-branches/debian/sid/stella/sid

« back to all changes in this revision

Viewing changes to debian/patches/build-with-gcc-4.6.patch

  • Committer: Package Import Robot
  • Author(s): Stephen Kitt
  • Date: 2011-10-26 23:04:32 UTC
  • Revision ID: package-import@ubuntu.com-20111026230432-cxcy9i2k9ylcschw
Tags: 3.4.1-2
https://launchpad.net/bugs/880114
* Make Stella available in the "Open With Other Applications..." menu
  in Gnome (and presumably similar entries in other desktop
  environments; LP: #880114).
* Build with gcc 4.6.1 (which identifies itself as gcc 4.6).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/build-with-gcc-4.6.patch
 
1
Description: Build with gcc 4.6 which reports itself as 4.6 only
 
2
Author: Stephen Kitt <steve@sk2.org>
 
3
Forwarded: yes
 
4
 
 
5
gcc 4.6.1 on Debian now reports its version as 4.6 only. This patch
 
6
adds the appropriate expression to the case statement matching
 
7
supported gcc versions.
 
8
 
 
9
--- stella.orig/configure
 
10
+++ stella/configure
 
11
@@ -383,7 +383,7 @@
 
12
 fi
 
13
 
 
14
 case $cxx_version in
 
15
-       2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
 
16
+       2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9]|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
 
17
                _cxx_major=`echo $cxx_version | cut -d '.' -f 1`
 
18
                _cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
 
19
                cxx_version="$cxx_version, ok"