[med-svn] [hyphy] 04/04: Hack around a mac-ism in setup.py

[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 67ca810b25a89ee523783607377b5c08a1d453aa
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 22 17:50:41 2015 +0200

    Hack around a mac-ism in setup.py
---
 debian/changelog                            |  5 +++--
 debian/patches/series                       |  1 +
 debian/patches/setup_fix_clean_target.patch | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e767caa..c034d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-hyphy (2.2.6+dfsg-1) UNRELEASED; urgency=medium
+hyphy (2.2.6+dfsg-1) unstable; urgency=medium
 
   * New upstream version
+  * Hack around a mac-ism in setup.py
 
- -- Andreas Tille <tille at debian.org>  Tue, 22 Sep 2015 17:00:57 +0200
+ -- Andreas Tille <tille at debian.org>  Tue, 22 Sep 2015 17:50:33 +0200
 
 hyphy (2.2.5+dfsg-2) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 18e3f96..490c633 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ spelling.patch
 drop_profiling_option.patch
 remove_unneeded_test.patch
 msse_option_only_if_available.patch
+setup_fix_clean_target.patch
diff --git a/debian/patches/setup_fix_clean_target.patch b/debian/patches/setup_fix_clean_target.patch
new file mode 100644
index 0000000..56399d5
--- /dev/null
+++ b/debian/patches/setup_fix_clean_target.patch
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 22 Sep 2015 17:00:57 +0200
+Forwarde-Upstream: yes
+Description: Brute force hack to get rid of a mac-ism
+
+--- a/src/lib/setup.py
++++ b/src/lib/setup.py
+@@ -51,8 +51,8 @@ includePaths += [linkPath, contribPath]
+ define_macros = [('__HYPHY_64__', None)] if '64' in architecture()[0] else []
+ 
+ # openmp on Mac OS X Lion is broken
+-major, minor, patch = mac_ver()[0].split('.')
+-openmp = ['-fopenmp'] if int(major) < 10 or (int(major) == 10 and int(minor) < 7) else []
++#major, minor, patch = mac_ver()[0].split('.')
++openmp = ['-fopenmp'] #if int(major) < 10 or (int(major) == 10 and int(minor) < 7) else []
+ 
+ setup(
+     name = 'HyPhy',

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