[SCM] yoshimi/master: Build with basic options.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e08d47d78396e1492a860aca224d6f34d5e2d04a
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 6 11:37:30 2010 +0100

    Build with basic options.

diff --git a/debian/patches/01-gcc_flags.patch b/debian/patches/01-gcc_flags.patch
index a8f4397..abe3453 100644
--- a/debian/patches/01-gcc_flags.patch
+++ b/debian/patches/01-gcc_flags.patch
@@ -4,8 +4,8 @@ Description: Drop GCC options which are not supported on all architectures.
 Bug: http://bugs.debian.org/584492
 Forwarded: no
 ---
- src/CMakeLists.txt |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/CMakeLists.txt |   12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
 
 --- yoshimi.orig/src/CMakeLists.txt
 +++ yoshimi/src/CMakeLists.txt
@@ -18,3 +18,20 @@ Forwarded: no
      CACHE STRING "X86 complier options"
  )
  
+@@ -193,15 +193,7 @@ if (BuildForDebug)
+     message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_DEBUG}")
+ else (BuildForDebug)
+     set (CMAKE_BUILD_TYPE "Release")
+-    if (BuildForAMD_X86_64)
+-        set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptions_x86_64AMD})
+-    else (BuildForAMD_X86_64)
+-        if (BuildForCore2_X86_64)
+-            set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptions_X86_64Core2})
+-        else (BuildForCore2_X86_64)
+-            set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
+-        endif (BuildForCore2_X86_64)
+-    endif (BuildForAMD_X86_64)
++    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
+     message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_RELEASE}")
+ endif (BuildForDebug)
+ 

-- 
yoshimi packaging