summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml1
-rw-r--r--var/spack/repos/builtin/packages/environment-modules/package.py19
-rw-r--r--var/spack/repos/builtin/packages/tcl/package.py2
3 files changed, 15 insertions, 7 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml
index 1b9eaf3822..c320442cbe 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml
@@ -21,6 +21,7 @@ spack:
- gcc@12.3.0
- mpileaks
- lmod@8.7.18
+ - environment-modules
- macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran
- ['%gcc@11']
- gcc_old_packages:
diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py
index 50c2d11a01..38bcd9b3ba 100644
--- a/var/spack/repos/builtin/packages/environment-modules/package.py
+++ b/var/spack/repos/builtin/packages/environment-modules/package.py
@@ -59,13 +59,15 @@ class EnvironmentModules(Package):
variant("X", default=True, description="Build with X functionality")
- depends_on("autoconf", type="build", when="@main")
- depends_on("automake", type="build", when="@main")
- depends_on("libtool", type="build", when="@main")
- depends_on("m4", type="build", when="@main")
- depends_on("python", type="build", when="@main")
- depends_on("py-sphinx@1.0:", type="build", when="@main")
- depends_on("gzip", type="build", when="@main")
+ depends_on("less", type=("build", "run"), when="@4.1:")
+ with when("@main"):
+ depends_on("autoconf", type="build")
+ depends_on("automake", type="build")
+ depends_on("libtool", type="build")
+ depends_on("m4", type="build")
+ depends_on("python", type="build")
+ depends_on("py-sphinx@1.0:", type="build")
+ depends_on("gzip", type="build")
# Dependencies:
depends_on("tcl", type=("build", "link", "run"))
@@ -135,6 +137,9 @@ class EnvironmentModules(Package):
]
)
+ if self.spec.satisfies("@4.1:"):
+ config_args.append(f"--with-pager={str(self.spec['less'].prefix.bin.less)}")
+
configure(*config_args)
make()
make("install")
diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py
index c0082dc52c..dee78161bb 100644
--- a/var/spack/repos/builtin/packages/tcl/package.py
+++ b/var/spack/repos/builtin/packages/tcl/package.py
@@ -37,6 +37,8 @@ class Tcl(AutotoolsPackage, SourceforgePackage):
configure_directory = "unix"
+ filter_compiler_wrappers("tclConfig.sh", relative_root="lib")
+
def install(self, spec, prefix):
with working_dir(self.build_directory):
make("install")