diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2023-11-08 19:38:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-08 19:38:41 +0100 |
| commit | afc693645a2b523ec45bc781bbfb5b29a3e7c680 (patch) | |
| tree | f6b8bc763b6098f00e98171ef0c72968caf8ac06 /var | |
| parent | 4ac0e511ad6dee9f9941689e063b08fc511daa5a (diff) | |
| download | spack-afc693645a2b523ec45bc781bbfb5b29a3e7c680.tar.gz spack-afc693645a2b523ec45bc781bbfb5b29a3e7c680.tar.bz2 spack-afc693645a2b523ec45bc781bbfb5b29a3e7c680.tar.xz spack-afc693645a2b523ec45bc781bbfb5b29a3e7c680.zip | |
tcl: filter compiler wrappers to avoid pointing to Spack (#40946)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/environment-modules/package.py | 19 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/tcl/package.py | 2 |
2 files changed, 14 insertions, 7 deletions
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") |