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

xsdk: phist has a conflict with gcc version <= gcc-4.9.1 (#11946)

Browse source 
* xsdk: phist has a conflict with gcc version <= gcc-4.9.1 - so add a variant to disable it on older compiler builds

This is triggered by #11677

* fix typo
This commit is contained in:
Satish Balay 2019-07-25 14:01:00 -05:00 committed by GitHub
parent e8a71089a6
commit 7bd3b66f6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
var/spack/repos/builtin/packages/xsdk/package.py
View file

@ -28,6 +28,7 @@ class Xsdk(Package):
variant('cuda', default=False, description='Enable CUDA dependent packages') variant('cuda', default=False, description='Enable CUDA dependent packages')
variant('omega-h', default=True, description='Enable omega-h package build') variant('omega-h', default=True, description='Enable omega-h package build')
variant('dealii', default=True, description='Enable dealii package build') variant('dealii', default=True, description='Enable dealii package build')
variant('phist', default=True, description='Enable phist package build')
depends_on('hypre@develop~internal-superlu+superlu-dist+shared', when='@develop') depends_on('hypre@develop~internal-superlu+superlu-dist+shared', when='@develop')
depends_on('hypre@2.15.1~internal-superlu', when='@0.4.0') depends_on('hypre@2.15.1~internal-superlu', when='@0.4.0')
@ -111,9 +112,9 @@ class Xsdk(Package):
# creates a conflict with other packages like petsc@develop. Actually # creates a conflict with other packages like petsc@develop. Actually
# these are type='build' dependencies, but spack reports a conflict anyway. # these are type='build' dependencies, but spack reports a conflict anyway.
# This will be fixed once the new concretizer becomes available # This will be fixed once the new concretizer becomes available
# (says @adamjsteward) # (says @adamjstewart)
depends_on('phist@develop kernel_lib=tpetra ~fortran ~scamac ~openmp ~host', when='@develop') depends_on('phist@develop kernel_lib=tpetra ~fortran ~scamac ~openmp ~host', when='@develop +phist')
depends_on('phist@1.7.5 kernel_lib=tpetra ~fortran ~scamac ~openmp ~host', when='@0.4.0') depends_on('phist@1.7.5 kernel_lib=tpetra ~fortran ~scamac ~openmp ~host', when='@0.4.0 +phist')
# xSDKTrilinos depends on the version of Trilinos built with # xSDKTrilinos depends on the version of Trilinos built with
# +tpetra which is turned off for faster xSDK # +tpetra which is turned off for faster xSDK