zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WIP] Use boost system layout by default (#1955)

Browse Source 
Use boost system layout by default
This commit is contained in:
scheibelp 2016-10-11 01:17:26 -07:00 committed by Todd Gamblin
parent f555b8110d
commit 9e7f53a35a
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
var/spack/repos/builtin/packages/boost/package.py
View File

@ -41,8 +41,8 @@ class Boost(Package):
list_url = "http://sourceforge.net/projects/boost/files/boost/"
list_depth = 2
version('1.62.0', '5fb94629535c19e48703bdb2b2e9490f') # TODO: fix build
version('1.61.0', '6095876341956f65f9d35939ccea1a9f', preferred=True)
version('1.62.0', '5fb94629535c19e48703bdb2b2e9490f')
version('1.61.0', '6095876341956f65f9d35939ccea1a9f')
version('1.60.0', '65a840e1a0b13a558ff19eeb2c4f0cbe')
version('1.59.0', '6aa9a5c6a4ca1016edd0ed1178e3cb87')
version('1.58.0', 'b8839650e61e9c1c0a89f371dd475546')
@ -110,12 +110,14 @@ class Boost(Package):
description="Additionally build shared libraries")
variant('multithreaded', default=True,
description="Build multi-threaded versions of libraries")
variant('singlethreaded', default=True,
variant('singlethreaded', default=False,
description="Build single-threaded versions of libraries")
variant('icu', default=False,
description="Build with Unicode and ICU suport")
variant('graph', default=False,
description="Build the Boost Graph library")
variant('taggedlayout', default=False,
description="Augment library names with build options")
depends_on('icu4c', when='+icu')
depends_on('python', when='+python')
@ -208,12 +210,20 @@ def determine_b2_options(self, spec, options):
if '+singlethreaded' in spec:
threadingOpts.append('single')
if not threadingOpts:
raise RuntimeError("""At least one of {singlethreaded,
multithreaded} must be enabled""")
raise RuntimeError("At least one of {singlethreaded, " +
"multithreaded} must be enabled")
if '+taggedlayout' in spec:
layout = 'tagged'
else:
if len(threadingOpts) > 1:
raise RuntimeError("Cannot build both single and " +
"multi-threaded targets with system layout")
layout = 'system'
options.extend([
'link=%s' % ','.join(linkTypes),
'--layout=tagged'
'--layout=%s' % layout
])
if not spec.satisfies('%intel'):
@ -223,6 +233,12 @@ def determine_b2_options(self, spec, options):
return threadingOpts
def add_buildopt_symlinks(self, prefix):
with working_dir(prefix.lib):
for lib in os.listdir(os.curdir):
prefix, remainder = lib.split('.', 1)
symlink(lib, '%s-mt.%s' % (prefix, remainder))
def install(self, spec, prefix):
# On Darwin, Boost expects the Darwin libtool. However, one of the
# dependencies may have pulled in Spack's GNU libtool, and these two
@ -281,11 +297,16 @@ def install(self, spec, prefix):
threadingOpts = self.determine_b2_options(spec, b2_options)
b2('--clean')
# In theory it could be done on one call but it fails on
# Boost.MPI if the threading options are not separated.
for threadingOpt in threadingOpts:
b2('install', 'threading=%s' % threadingOpt, *b2_options)
if '+multithreaded' in spec and '~taggedlayout' in spec:
self.add_buildopt_symlinks(prefix)
# The shared libraries are not installed correctly
# on Darwin; correct this
if (sys.platform == 'darwin') and ('+shared' in spec):

3
var/spack/repos/builtin/packages/cantera/package.py
View File

@ -96,8 +96,7 @@ def install(self, spec, prefix):
options.extend([
'build_thread_safe=yes',
'boost_inc_dir={0}'.format(spec['boost'].prefix.include),
'boost_lib_dir={0}'.format(spec['boost'].prefix.lib),
'boost_thread_lib=boost_thread-mt,boost_system-mt'
'boost_lib_dir={0}'.format(spec['boost'].prefix.lib)
])
else:
options.append('build_thread_safe=no')