Skip to content

Commit b7d5df7

Browse files
committed
yet another round of fixes for Mac OS X compilation
1 parent e655049 commit b7d5df7

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

setup2.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ def findboost(self, libsearch, includesearch, pyversion):
118118
self.boost_library_dir = d
119119
self.boostlib = "boost_python"
120120
break
121+
elif os.path.exists(d + "/libboost_python" + pyversion + ".dylib"): #Mac OS X
122+
self.boost_library_dir = d
123+
self.boostlib = "boost_python" + pyversion
124+
break
121125
elif os.path.exists(d + "/libboost_python.dylib"): #Mac OS X
122126
self.boost_library_dir = d
123127
#probably goes wrong if this is for python 2!
@@ -189,7 +193,7 @@ def build_extensions(self):
189193

190194
setup(
191195
name="python-timbl",
192-
version="2018.03.07",
196+
version="2018.04.23",
193197
description="Python 2 language binding for the Tilburg Memory-Based Learner",
194198
author="Sander Canisius, Maarten van Gompel",
195199

setup3.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ def findboost(self, libsearch, includesearch, pyversion):
9797
self.boostlib = "boost_python"
9898
if os.path.exists('/usr/local/opt/boost-python3'):
9999
#Mac OS X with homebrew
100-
self.boostlib = "boost_python3"
101100
libsearch.insert(0,'/usr/local/opt/boost-python3/lib')
102101
libsearch.insert(0,'/usr/local/opt/boost/lib')
103102
includesearch.insert(0,'/usr/local/opt/boost/include')
@@ -116,6 +115,10 @@ def findboost(self, libsearch, includesearch, pyversion):
116115
self.boost_library_dir = d
117116
self.boostlib = "boost_python"
118117
break
118+
elif os.path.exists(d + "/libboost_python" + pyversion + ".dylib"): #Mac OS X
119+
self.boost_library_dir = d
120+
self.boostlib = "boost_python" + pyversion
121+
break
119122
elif os.path.exists(d + "/libboost_python3.dylib"): #Mac OS X
120123
self.boost_library_dir = d
121124
self.boostlib = "boost_python3"
@@ -191,7 +194,7 @@ def build_extensions(self):
191194

192195
setup(
193196
name="python3-timbl",
194-
version="2018.03.07",
197+
version="2018.04.23",
195198
description="Python 3 language binding for the Tilburg Memory-Based Learner",
196199
author="Sander Canisius, Maarten van Gompel",
197200

0 commit comments

Comments
 (0)