[woo] 01/02: Remove all march flags. (Closes: #797092)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository woo.

commit ebc5dfc1a2480810e9dd537626a9b82be168225a
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Sep 4 21:13:03 2015 +0200

    Remove all march flags. (Closes: #797092)
---
 debian/patches/40_remove_core2.patch | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/patches/40_remove_core2.patch b/debian/patches/40_remove_core2.patch
index ce2d4b2..83c6800 100644
--- a/debian/patches/40_remove_core2.patch
+++ b/debian/patches/40_remove_core2.patch
@@ -1,4 +1,4 @@
-Description: Remove core2 flag and gold-linker
+Description: Remove march flags and gold-linker
 Author: Anton Gladky <gladk at debian.org>
 Bug-Debian: https://bugs.debian.org/797092
 Bug-Debian: https://bugs.debian.org/797094
@@ -8,15 +8,18 @@ Index: woo/setup.py
 ===================================================================
 --- woo.orig/setup.py
 +++ woo/setup.py
-@@ -90,7 +90,6 @@ chunkSize=1
- march='corei7' if WIN else 'native'
+@@ -87,10 +87,8 @@ chunkSize=1
+ # features+=['noxml']
+ 
+ ## arch-specific optimizations
+-march='corei7' if WIN else 'native'
  # lower, but at least some machine-specific optimizations
  # FIXME: code will fail to execute on older CPUs
 -if DISTBUILD: march='core2' 
  
  ##
  ## end build options
-@@ -280,9 +279,6 @@ if WIN:
+@@ -280,9 +278,6 @@ if WIN:
  	cxxLibs=[(lib+boostTag if lib.startswith('boost_') else lib) for lib in cxxLibs]
  else:
  	cppDirs+=['/usr/include/eigen3']
@@ -26,3 +29,12 @@ Index: woo/setup.py
  	
  ##
  ## Debug-specific
+@@ -292,8 +287,6 @@ if debug:
+ 	cxxFlags+=['-Os']
+ else:
+ 	cppDef+=[('NDEBUG',None),]
+-	cxxFlags+=['-g0','-O3']
+-	if march: cxxFlags+=['-march=%s'%march]
+ 	linkFlags+=['-Wl,--strip-all']
+ ##
+ ## Feature-specific

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/woo.git