tjh.dev
1--- vowpalwabbit-8.5.0.orig/setup.py 2018-09-03 20:32:39.000000000 +0200
2+++ vowpalwabbit-8.5.0/setup.py 2018-09-03 20:34:09.000000000 +0200
3@@ -23,18 +23,11 @@
4
5 def find_boost():
6 """Find correct boost-python library information """
7- if system == 'Linux':
8+ if system == 'Linux' or system == 'Darwin':
9 # use version suffix if present
10- boost_lib = 'boost_python-py{v[0]}{v[1]}'.format(v=sys.version_info)
11- if sys.version_info.major == 3:
12- for candidate in ['-py36', '-py35', '-py34', '3']:
13- boost_lib = 'boost_python{}'.format(candidate)
14- if find_library(boost_lib):
15- exit
16+ boost_lib = 'boost_python{v[0]}{v[1]}'.format(v=sys.version_info)
17 if not find_library(boost_lib):
18 boost_lib = "boost_python"
19- elif system == 'Darwin':
20- boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
21 elif system == 'Cygwin':
22 boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
23 else:
24--- vowpalwabbit-8.5.0.orig/src/Makefile 2018-09-03 20:32:40.000000000 +0200
25+++ vowpalwabbit-8.5.0/src/Makefile 2018-09-03 21:42:30.000000000 +0200
26@@ -37,7 +37,7 @@
27 NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
28 endif
29 ifeq ($(UNAME), Darwin)
30- LIBS = -lboost_program_options-mt -lboost_serialization-mt -l pthread -l z
31+ LIBS = -lboost_program_options -lboost_serialization -l pthread -l z
32 # On Macs, the location isn't always clear
33 # brew uses /usr/local
34 # but /opt/local seems to be preferred by some users