From 7bd3b66f6ec3284074726861fdf2596e6d6787c3 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 25 Jul 2019 14:01:00 -0500 Subject: xsdk: phist has a conflict with gcc version <= gcc-4.9.1 (#11946) * 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 --- var/spack/repos/builtin/packages/xsdk/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 170e4d1f5b..e6e3426f4d 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -28,6 +28,7 @@ class Xsdk(Package): variant('cuda', default=False, description='Enable CUDA dependent packages') variant('omega-h', default=True, description='Enable omega-h 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@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 # these are type='build' dependencies, but spack reports a conflict anyway. # This will be fixed once the new concretizer becomes available - # (says @adamjsteward) - depends_on('phist@develop kernel_lib=tpetra ~fortran ~scamac ~openmp ~host', when='@develop') - depends_on('phist@1.7.5 kernel_lib=tpetra ~fortran ~scamac ~openmp ~host', when='@0.4.0') + # (says @adamjstewart) + 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 +phist') # xSDKTrilinos depends on the version of Trilinos built with # +tpetra which is turned off for faster xSDK -- cgit v1.2.3-70-g09d2