[SCM] yoshimi/master: Refresh build flags patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5e3c7a62b622a36a3cad55e3d0383f156559c595
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 22 09:49:58 2010 +0100

    Refresh build flags patch.

diff --git a/debian/patches/01-gcc_flags.patch b/debian/patches/01-gcc_flags.patch
index abe3453..aecf402 100644
--- a/debian/patches/01-gcc_flags.patch
+++ b/debian/patches/01-gcc_flags.patch
@@ -4,21 +4,22 @@ Description: Drop GCC options which are not supported on all architectures.
 Bug: http://bugs.debian.org/584492
 Forwarded: no
 ---
- src/CMakeLists.txt |   12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
+ src/CMakeLists.txt |   17 ++++-------------
+ 1 file changed, 4 insertions(+), 13 deletions(-)
 
 --- yoshimi.orig/src/CMakeLists.txt
 +++ yoshimi/src/CMakeLists.txt
-@@ -74,7 +74,7 @@ set (BuildOptions_X86_64Core2
- )
+@@ -82,6 +82,9 @@ set (BuildOptions32bit
+ set (BuildOptionsDebug
+     "-O0 -g3 -ggdb -Wall -Wpointer-arith" CACHE STRING "Debug build flags")
  
- set (BuildOptionsBasic
--    "-O3 -march=pentium4 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer"
-+    "-O3 -ffast-math -fomit-frame-pointer"
-     CACHE STRING "X86 complier options"
- )
- 
-@@ -193,15 +193,7 @@ if (BuildForDebug)
++set (BuildOptionsDebian
++    "-O3 -ffast-math -fomit-frame-pointer" CACHE STRING "Debian build flags")
++
+ find_package (PkgConfig REQUIRED)
+ if (PKG_CONFIG_FOUND)
+     message(STATUS "Found pkg-config ${PKG_CONFIG_EXECUTABLE}")
+@@ -194,19 +197,7 @@ if (BuildForDebug)
      message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_DEBUG}")
  else (BuildForDebug)
      set (CMAKE_BUILD_TYPE "Release")
@@ -28,10 +29,14 @@ Forwarded: no
 -        if (BuildForCore2_X86_64)
 -            set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptions_X86_64Core2})
 -        else (BuildForCore2_X86_64)
--            set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
+-            if (BuildFor32bit)  
+-                set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptions32bit})
+-            else (BuildFor32bit)  
+-                message(FATAL_ERROR "Please choose one of the BuildForXXX options!")
+-            endif (BuildFor32bit)  
 -        endif (BuildForCore2_X86_64)
 -    endif (BuildForAMD_X86_64)
-+    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
++    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsDebian})
      message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_RELEASE}")
  endif (BuildForDebug)
  

-- 
yoshimi packaging