From acd80b16a8a4faf8b73de44d14e83d49cfca51d1 Mon Sep 17 00:00:00 2001 From: becker33 Date: Tue, 28 Nov 2017 10:33:45 -0800 Subject: update scr package for cray (#6407) * update scr package for cray * added info on scr version 1.2.0 --- var/spack/repos/builtin/packages/scr/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 1f49f34969..24b3de7102 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -40,6 +40,8 @@ class Scr(CMakePackage): # url = "https://github.com/LLNL/scr/releases/download/v1.1.8/scr-1.1.8.tar.gz" # version('1.1.8', '6a0f11ad18e27fcfc00a271ff587b06e') + url = "https://github.com/LLNL/scr/archive/v1.2.0.tar.gz" + version('1.2.0', '060e9e9c7604c1765f3991f9cd6e9d2d') version('master', git='https://github.com/llnl/scr.git', branch='master') depends_on('pdsh+static_modules', type=('build', 'run')) @@ -89,6 +91,8 @@ class Scr(CMakePackage): variant('cntl_base', default='/tmp', description='Compile time default location for control directory.') + conflicts('platform=bgq') + def get_abs_path_rel_prefix(self, path): # Return path if absolute, otherwise prepend prefix if os.path.isabs(path): @@ -100,6 +104,9 @@ class Scr(CMakePackage): spec = self.spec args = [] + if 'platform=cray' in spec: + args.append('-DSCR_LINK_STATIC=ON') + args.append('-DENABLE_FORTRAN={0}'.format('+fortran' in spec)) conf_path = self.get_abs_path_rel_prefix( -- cgit v1.2.3-60-g2f50