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

1. added default install libs (atomic, test, locale, program_options)

Browse Source 
2. clarify comment for default_noinstall_libs
3. renamed regex_icu variant to icu_support (both the locale and regex libs can
use it)
4. explicitly set b2 install ICU_PATH when regex_icu is activated
This commit is contained in:
Peter Scheibel 2016-01-22 13:25:45 -08:00
parent 4a55b97d11
commit 9f99ee61c7
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,24 +45,28 @@ class Boost(Package):
version('1.34.1', '2d938467e8a448a2c9763e0a9f8ca7e5') version('1.34.1', '2d938467e8a448a2c9763e0a9f8ca7e5')
version('1.34.0', 'ed5b9291ffad776f8757a916e1726ad0') version('1.34.0', 'ed5b9291ffad776f8757a916e1726ad0')
default_install_libs = set(['chrono', default_install_libs = set(['atomic',
'chrono',
'date_time', 'date_time',
'filesystem', 'filesystem',
'graph', 'graph',
'iostreams', 'iostreams',
'locale',
'log', 'log',
'math', 'math',
'program_options',
'random', 'random',
'regex', 'regex',
'serialization', 'serialization',
'signals', 'signals',
'system', 'system',
'test',
'thread', 'thread',
'wave']) 'wave'])
# These are not installed by default because they pull in many dependencies # mpi/python are not installed by default because they pull in many
# and/or because there is a great deal of customization possible (and it # dependencies and/or because there is a great deal of customization
# would be difficult or tedious to choose sensible defaults here). # possible (and it would be difficult to choose sensible defaults)
default_noinstall_libs = set(['mpi', 'python']) default_noinstall_libs = set(['mpi', 'python'])
all_libs = default_install_libs | default_noinstall_libs all_libs = default_install_libs | default_noinstall_libs
@ -75,9 +79,9 @@ class Boost(Package):
variant('shared', default=True, description="Additionally build shared libraries") variant('shared', default=True, description="Additionally build shared libraries")
variant('multithreaded', default=True, description="Build multi-threaded versions of libraries") variant('multithreaded', default=True, description="Build multi-threaded versions of libraries")
variant('singlethreaded', default=True, description="Build single-threaded versions of libraries") variant('singlethreaded', default=True, description="Build single-threaded versions of libraries")
variant('regex_icu', default=False, description="Include regex ICU support (by default false even if regex library is compiled)") variant('icu_support', default=False, description="Include ICU support (for regex/locale libraries)")
depends_on('icu', when='+regex_icu') depends_on('icu', when='+icu_support')
depends_on('python', when='+python') depends_on('python', when='+python')
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
depends_on('bzip2', when='+iostreams') depends_on('bzip2', when='+iostreams')
@ -134,6 +138,9 @@ def determine_b2_options(self, spec, options):
else: else:
options.append('variant=release') options.append('variant=release')
if '+icu_support' in spec:
options.extend(['-s', 'ICU_PATH=%s' % spec['icu'].prefix])
if '+iostreams' in spec: if '+iostreams' in spec:
options.extend([ options.extend([
'-s', 'BZIP2_INCLUDE=%s' % spec['bzip2'].prefix.include, '-s', 'BZIP2_INCLUDE=%s' % spec['bzip2'].prefix.include,