[med-svn] [hyphy] 02/03: Remove arch specific flags

[Andreas Tille]

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

tille pushed a commit to branch master
in repository hyphy.

commit 54931638a1ddd6cafef279af88da03c45518fa36
Author: Andreas Tille <tille at debian.org>
Date:   Mon Oct 26 11:20:18 2015 +0100

    Remove arch specific flags
---
 debian/changelog                                |  6 +++++-
 debian/patches/remove_arch_specific_flags.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 588599d..a8b8ee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 hyphy (2.2.6+dfsg-2) UNRELEASED; urgency=medium
 
-  [  Matthias Klose ]
+  [ Matthias Klose ]
   * Hand-edit swig generated file to build with Python3.5.
     Closes: #802999
 
+  [ Andreas Tille ]
+  * Remove arch specific flags
+    Closes: #802994
+
  -- Andreas Tille <tille at debian.org>  Mon, 26 Oct 2015 11:09:03 +0100
 
 hyphy (2.2.6+dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/remove_arch_specific_flags.patch b/debian/patches/remove_arch_specific_flags.patch
new file mode 100644
index 0000000..1bd27f3
--- /dev/null
+++ b/debian/patches/remove_arch_specific_flags.patch
@@ -0,0 +1,25 @@
+Author: Andreas Tille
+Last-Update: Mon, 26 Oct 2015 11:19:57 +0100
+Bug-Debian: http://bugs.debian.org/802994
+Description: remove optimizations for the local machine
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,7 @@ macro(PCL_CHECK_FOR_AVX)
+   set(CMAKE_REQUIRED_FLAGS)
+ 
+   if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+-      set(CMAKE_REQUIRED_FLAGS "-march=corei7-avx -mtune=corei7-avx")
++      set(CMAKE_REQUIRED_FLAGS "")
+   endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+ 
+   check_cxx_source_runs("
+@@ -125,7 +125,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP
+     
+     PCL_CHECK_FOR_AVX()
+     if(${HAVE_AVX_EXTENSIONS})
+-        set(DEFAULT_COMPILE_FLAGS "${DEFAULT_COMPILE_FLAGS} -march=corei7-avx -mtune=corei7-avx")
++        set(DEFAULT_COMPILE_FLAGS "${DEFAULT_COMPILE_FLAGS} ")
+         add_definitions (-D_SLKP_USE_AVX_INTRINSICS)
+     else(${HAVE_AVX_EXTENSIONS})
+         PCL_CHECK_FOR_SSE3()
diff --git a/debian/patches/series b/debian/patches/series
index 7637bde..8b4b4a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ remove_unneeded_test.patch
 msse_option_only_if_available.patch
 setup_fix_clean_target.patch
 python3.5.patch
+remove_arch_specific_flags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/hyphy.git