diff options
| author | 健美猫 <weijianwen@gmail.com> | 2017-12-12 05:14:24 +0800 |
|---|---|---|
| committer | scheibelp <scheibel1@llnl.gov> | 2017-12-11 13:14:24 -0800 |
| commit | e19aa807349cd29a4787ce3f0a256ea3cbfd502f (patch) | |
| tree | 60b1c97502b66c293270a0a86f55c5add592fad4 | |
| parent | bd5d6b2bfaa6b9fd3ad6231c4d5b97736476d4d9 (diff) | |
| download | spack-e19aa807349cd29a4787ce3f0a256ea3cbfd502f.tar.gz spack-e19aa807349cd29a4787ce3f0a256ea3cbfd502f.tar.bz2 spack-e19aa807349cd29a4787ce3f0a256ea3cbfd502f.tar.xz spack-e19aa807349cd29a4787ce3f0a256ea3cbfd502f.zip | |
intel-parallel-studio: restrict patch to versions > 2016 (#6523)
Fixes #6522
Patch psxevars.sh and psxevars.csh only when year > 2016.
pxevars.csh does not exist for versions before 2017. psxevars.sh
does not appear to require this patch for versions before 2017.
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index ff0315a42a..fefda18e18 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -435,15 +435,16 @@ class IntelParallelStudio(IntelPackage): @run_after('install') def fix_psxevars(self): - """Newer versions of Intel Parallel Studio have a bug in the + """Newer versions (>2016) of Intel Parallel Studio have a bug in the ``psxevars.sh`` script.""" bindir = glob.glob(join_path( self.prefix, 'parallel_studio*', 'bin'))[0] - filter_file('^SCRIPTPATH=.*', 'SCRIPTPATH={0}'.format(self.prefix), - os.path.join(bindir, 'psxevars.sh'), - os.path.join(bindir, 'psxevars.csh')) + if self.version[1] > 2016: + filter_file('^SCRIPTPATH=.*', 'SCRIPTPATH={0}'.format(self.prefix), + os.path.join(bindir, 'psxevars.sh'), + os.path.join(bindir, 'psxevars.csh')) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): if '+mpi' in self.spec: |