summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-06-28 09:05:26 -0700
committerGitHub <noreply@github.com>2016-06-28 09:05:26 -0700
commitad48ad75865e07c4886ec2cbceca6a2d428b690c (patch)
tree711dda7bfb0ef3c54ab861bb6fbb60ad9bd9b33a
parent6810965457faf93b25f0b377bcf52d825d9d1d88 (diff)
parent5cdd37959a7b2c0d9b18d508f15773209e5aba55 (diff)
downloadspack-ad48ad75865e07c4886ec2cbceca6a2d428b690c.tar.gz
spack-ad48ad75865e07c4886ec2cbceca6a2d428b690c.tar.bz2
spack-ad48ad75865e07c4886ec2cbceca6a2d428b690c.tar.xz
spack-ad48ad75865e07c4886ec2cbceca6a2d428b690c.zip
Merge pull request #1131 from epfl-scitas/fixes/swift_git_environment_variables
fix : swiftsim will set git environment variables in the appropriate hook
-rw-r--r--var/spack/repos/builtin/packages/swiftsim/package.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/swiftsim/package.py b/var/spack/repos/builtin/packages/swiftsim/package.py
index e4607d9146..42e8fb466a 100644
--- a/var/spack/repos/builtin/packages/swiftsim/package.py
+++ b/var/spack/repos/builtin/packages/swiftsim/package.py
@@ -25,16 +25,8 @@
from spack import *
-import spack.environment
import llnl.util.tty as tty
-# Needed to be able to download from the Durham gitlab repository
-tty.warn('Setting "GIT_SSL_NO_VERIFY=1"')
-tty.warn('This is needed to clone SWIFT repository')
-gitlab_env = spack.environment.EnvironmentModifications()
-gitlab_env.set('GIT_SSL_NO_VERIFY', 1)
-gitlab_env.apply_modifications()
-
class Swiftsim(Package):
"""
@@ -46,7 +38,7 @@ class Swiftsim(Package):
homepage = 'http://icc.dur.ac.uk/swift/'
url = 'http://gitlab.cosma.dur.ac.uk/swift/swiftsim/repository/archive.tar.gz?ref=v0.3.0'
- version('0.3.0', git='https://gitlab.cosma.dur.ac.uk/swift/swiftsim.git', tag='v0.3.0')
+ version('0.3.0', git='https://gitlab.cosma.dur.ac.uk/swift/swiftsim.git', commit='254cc1b563b2f88ddcf437b1f71da123bb9db733')
variant('mpi', default=True, description='Enable distributed memory parallelism')
@@ -61,6 +53,12 @@ class Swiftsim(Package):
depends_on('hdf5~mpi', when='~mpi')
depends_on('hdf5+mpi', when='+mpi')
+ def setup_environment(self, spack_env, run_env):
+ # Needed to be able to download from the Durham gitlab repository
+ tty.warn('Setting "GIT_SSL_NO_VERIFY=1"')
+ tty.warn('This is needed to clone SWIFT repository')
+ spack_env.set('GIT_SSL_NO_VERIFY', 1)
+
def install(self, spec, prefix):
# Generate configure from configure.ac
# and Makefile.am