hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

opencv : Use dso_suffix for python lib

Browse source
This commit is contained in:
mwilliammyers 2016-07-18 21:57:08 -06:00
parent ea9fa81ba5
commit bd02892f7b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
var/spack/repos/builtin/packages/opencv/package.py
View file

@ -164,8 +164,8 @@ def install(self, spec, prefix):
python = spec['python'] python = spec['python']
try: try:
python_lib = glob(join_path(python.prefix.lib, python_lib = glob(join_path(
'libpython*.so'))[0] python.prefix.lib, 'libpython*.{0}'.format(dso_suffix)))[0]
except KeyError: except KeyError:
raise InstallError('Cannot find libpython') raise InstallError('Cannot find libpython')
@ -186,7 +186,6 @@ def install(self, spec, prefix):
]) ])
elif '^python@2:3' in spec: elif '^python@2:3' in spec:
python_exe = join_path(python.prefix.bin, 'python2') python_exe = join_path(python.prefix.bin, 'python2')
python_lib = glob(join_path(python.prefix.lib, '*.so'))
cmake_options.extend([ cmake_options.extend([
'-DBUILD_opencv_python2=ON', '-DBUILD_opencv_python2=ON',
'-DPYTHON2_EXECUTABLE={0}'.format(python_exe), '-DPYTHON2_EXECUTABLE={0}'.format(python_exe),