diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-08-07 15:55:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-07 15:55:16 -0700 |
| commit | 8121ac2c270d5a71bd7eed7a066b4fbd44c951ea (patch) | |
| tree | 0bc2eb6d714be60c3a766566d919dc83f4519273 | |
| parent | 93f5a750cb2e97ee4e50ea89a434ce51e2e182fe (diff) | |
| parent | 09d96bef9ff2f00ad18d70f3ff88bd3734ef149b (diff) | |
| download | spack-8121ac2c270d5a71bd7eed7a066b4fbd44c951ea.tar.gz spack-8121ac2c270d5a71bd7eed7a066b4fbd44c951ea.tar.bz2 spack-8121ac2c270d5a71bd7eed7a066b4fbd44c951ea.tar.xz spack-8121ac2c270d5a71bd7eed7a066b4fbd44c951ea.zip | |
Merge pull request #1464 from hartzell/feature/update-lmod
No need to patch Lmod after 6.4.4
| -rw-r--r-- | var/spack/repos/builtin/packages/lmod/package.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index 01911c1a30..a3ae4a7f51 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -38,6 +38,7 @@ class Lmod(Package): homepage = 'https://www.tacc.utexas.edu/research-development/tacc-projects/lmod' # NOQA: ignore=E501 url = 'https://github.com/TACC/Lmod/archive/6.4.1.tar.gz' + version('6.4.5', '14f6c58dbc0a5a75574d795eac2c1e3c') version('6.4.1', '7978ba777c8aa41a4d8c05fec5f780f4') version('6.3.7', '0fa4d5a24c41cae03776f781aa2dedc1') version('6.0.1', '91abf52fe5033bd419ffe2842ebe7af9') @@ -55,15 +56,16 @@ class Lmod(Package): spack_env.append_path('LUA_PATH', stage_lua_path.format( version=self.version), separator=';') - patch('fix_tclsh_paths.patch') + patch('fix_tclsh_paths.patch', when='@:6.4.3') def patch(self): """The tcl scripts should use the tclsh that was discovered by the configure script. Touch up their #! lines so that the sed in the Makefile's install step has something to work on. Requires the change in the associated patch file.fg""" - for tclscript in glob('src/*.tcl'): - filter_file(r'^#!.*tclsh', '#!@path_to_tclsh@', tclscript) + if self.spec.version <= Version('6.4.3'): + for tclscript in glob('src/*.tcl'): + filter_file(r'^#!.*tclsh', '#!@path_to_tclsh@', tclscript) def install(self, spec, prefix): configure('--prefix=%s' % prefix) |