diff options
| author | Xavier Delaruelle <xavier.delaruelle@cea.fr> | 2020-08-31 17:43:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 10:43:31 -0500 |
| commit | 7036f41ea5f4452b7e1ea87691ed522b55437847 (patch) | |
| tree | 952cbbe2332afe7c8b12f667b73b325401a78a23 | |
| parent | 97f7378097714f42934d02cc71422c714af6e69d (diff) | |
| download | spack-7036f41ea5f4452b7e1ea87691ed522b55437847.tar.gz spack-7036f41ea5f4452b7e1ea87691ed522b55437847.tar.bz2 spack-7036f41ea5f4452b7e1ea87691ed522b55437847.tar.xz spack-7036f41ea5f4452b7e1ea87691ed522b55437847.zip | |
environment-modules: fix version 4.5.2 install (#18421)
`configure` script of Modules 4.5.2 is a bit too strict and breaks when
special options like `--disable-dependency-tracking` are set. This issue
will be fixed on Modules project starting version 4.5.3
(cea-hpc/modules#354).
This change adapts `configure` options set when installing version 4.5.2
to avoid options unrecognized on this version.
Fix #18420
| -rw-r--r-- | var/spack/repos/builtin/packages/environment-modules/package.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py index d2d1853304..0bf1f56b9a 100644 --- a/var/spack/repos/builtin/packages/environment-modules/package.py +++ b/var/spack/repos/builtin/packages/environment-modules/package.py @@ -64,12 +64,18 @@ class EnvironmentModules(Package): # It looks for tclConfig.sh "--with-tcl=" + tcl_lib_dir, "--with-tcl-ver={0}.{1}".format(*tcl.version.version[0:2]), - '--disable-dependency-tracking', - '--disable-silent-rules', '--disable-versioning', '--datarootdir=' + prefix.share ] + # ./configure script on version 4.5.2 breaks when specific options are + # set (see https://github.com/cea-hpc/modules/issues/354) + if not spec.satisfies('@4.5.2'): + config_args.extend([ + '--disable-dependency-tracking', + '--disable-silent-rules' + ]) + if '~X' in spec: config_args = ['--without-x'] + config_args |