diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/boost/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/package.py | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 487445ab10..d4c772ed03 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -25,7 +25,6 @@ from spack import * import sys import os -from glob import glob class Boost(Package): @@ -173,23 +172,11 @@ class Boost(Package): return 'gcc' def bjam_python_line(self, spec): - from os.path import dirname, splitext - pydir = 'python%s.%s*' % spec['python'].version.version[:2] - incs = join_path(spec['python'].prefix.include, pydir, "pyconfig.h") - incs = glob(incs) - incs = " ".join([dirname(u) for u in incs]) - - pylib = 'libpython%s.%s*' % spec['python'].version.version[:2] - all_libs = join_path(spec['python'].prefix.lib, pylib) - libs = [u for u in all_libs if splitext(u)[1] == dso_suffix] - if len(libs) == 0: - libs = [u for u in all_libs if splitext(u)[1] == '.a'] - - libs = " ".join(libs) - return 'using python : %s : %s : %s : %s ;\n' % ( + return 'using python : {0} : {1} : {2} : {3} ;\n'.format( spec['python'].version.up_to(2), - join_path(spec['python'].prefix.bin, 'python'), - incs, libs + spec['python'].command.path, + spec['python'].headers.directories[0], + spec['python'].libs[0] ) def determine_bootstrap_options(self, spec, withLibs, options): @@ -198,7 +185,7 @@ class Boost(Package): options.append("--with-libraries=%s" % ','.join(withLibs)) if '+python' in spec: - options.append('--with-python=%s' % python_exe) + options.append('--with-python=%s' % spec['python'].command.path) with open('user-config.jam', 'w') as f: # Boost may end up using gcc even though clang+gfortran is set in |