hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tcl: filter compiler wrappers to avoid pointing to Spack (#40946)

Browse source
This commit is contained in:
Massimiliano Culpo 2023-11-08 19:38:41 +01:00 committed by GitHub
parent 4ac0e511ad
commit afc693645a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml
View file

@ -21,6 +21,7 @@ spack:
- gcc@12.3.0 - gcc@12.3.0
- mpileaks - mpileaks
- lmod@8.7.18 - lmod@8.7.18
- environment-modules
- macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran - macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran
- ['%gcc@11'] - ['%gcc@11']
- gcc_old_packages: - gcc_old_packages:

19
var/spack/repos/builtin/packages/environment-modules/package.py
View file

@ -59,13 +59,15 @@ class EnvironmentModules(Package):
variant("X", default=True, description="Build with X functionality") variant("X", default=True, description="Build with X functionality")
depends_on("autoconf", type="build", when="@main") depends_on("less", type=("build", "run"), when="@4.1:")
depends_on("automake", type="build", when="@main") with when("@main"):
depends_on("libtool", type="build", when="@main") depends_on("autoconf", type="build")
depends_on("m4", type="build", when="@main") depends_on("automake", type="build")
depends_on("python", type="build", when="@main") depends_on("libtool", type="build")
depends_on("py-sphinx@1.0:", type="build", when="@main") depends_on("m4", type="build")
depends_on("gzip", type="build", when="@main") depends_on("python", type="build")
depends_on("py-sphinx@1.0:", type="build")
depends_on("gzip", type="build")
# Dependencies: # Dependencies:
depends_on("tcl", type=("build", "link", "run")) depends_on("tcl", type=("build", "link", "run"))
@ -135,6 +137,9 @@ def install(self, spec, prefix):
] ]
) )
if self.spec.satisfies("@4.1:"):
config_args.append(f"--with-pager={str(self.spec['less'].prefix.bin.less)}")
configure(*config_args) configure(*config_args)
make() make()
make("install") make("install")

2
var/spack/repos/builtin/packages/tcl/package.py
View file

@ -37,6 +37,8 @@ class Tcl(AutotoolsPackage, SourceforgePackage):
configure_directory = "unix" configure_directory = "unix"
filter_compiler_wrappers("tclConfig.sh", relative_root="lib")
def install(self, spec, prefix): def install(self, spec, prefix):
with working_dir(self.build_directory): with working_dir(self.build_directory):
make("install") make("install")