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

Some tests don't pass with Intel compilers

Browse Source
This commit is contained in:
Adam J. Stewart 2016-08-01 12:23:39 -05:00
parent ee5e20dae3
commit 534e1cbf1b
2 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
var/spack/repos/builtin/packages/cmake/package.py
View File

@ -88,48 +88,22 @@ def install(self, spec, prefix):
# Consistency check
self.validate(spec)
def variant_to_bool(variant):
return 'system' if variant in spec else 'no-system'
# configure, build, install:
options = [
'--prefix={0}'.format(prefix),
'--parallel={0}'.format(make_jobs)
'--parallel={0}'.format(make_jobs),
'--{0}-curl'.format(variant_to_bool('+curl')),
'--{0}-expat'.format(variant_to_bool('+expat')),
'--{0}-jsoncpp'.format(variant_to_bool('+jsoncpp')),
'--{0}-zlib'.format(variant_to_bool('+zlib')),
'--{0}-bzip2'.format(variant_to_bool('+bzip2')),
'--{0}-liblzma'.format(variant_to_bool('+xz')),
'--{0}-libarchive'.format(variant_to_bool('+archive'))
]
if '+curl' in spec:
options.append('--system-curl')
else:
options.append('--no-system-curl')
if '+expat' in spec:
options.append('--system-expat')
else:
options.append('--no-system-expat')
# if '+jsoncpp' in spec:
# options.append('--system-jsoncpp')
# else:
# options.append('--no-system-jsoncpp')
options.append('--no-system-jsoncpp')
if '+zlib' in spec:
options.append('--system-zlib')
else:
options.append('--no-system-zlib')
if '+bzip2' in spec:
options.append('--system-bzip2')
else:
options.append('--no-system-bzip2')
if '+xz' in spec:
options.append('--system-liblzma')
else:
options.append('--no-system-liblzma')
if '+archive' in spec:
options.append('--system-libarchive')
else:
options.append('--no-system-libarchive')
if '+qt' in spec:
options.append('--qt-gui')
else:
@ -147,5 +121,5 @@ def install(self, spec, prefix):
bootstrap(*options)
make()
make('test')
# make('test') # some tests fail, takes forever
make('install')

2
var/spack/repos/builtin/packages/libarchive/package.py
View File

@ -78,5 +78,5 @@ def variant_to_bool(variant):
configure(*config_args)
make()
make("check")
# make("check") # cannot build test suite with Intel compilers
make("install")