zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lmod: fix build on macOS (#48438)

Browse Source
This commit is contained in:
Harmen Stoppels 2025-01-13 12:53:11 +01:00 committed by GitHub
parent 1759ce05dd
commit c989541ebc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
var/spack/repos/builtin/packages/lmod/package.py
View File

@ -64,6 +64,9 @@ class Lmod(AutotoolsPackage):
depends_on("bc", type="build", when="@8.7.10:") depends_on("bc", type="build", when="@8.7.10:")
# GNU sed is required instead of bsd sed on macOS
depends_on("sed", type="build", when="platform=darwin")
variant("auto_swap", default=True, description="Auto swapping of compilers, etc.") variant("auto_swap", default=True, description="Auto swapping of compilers, etc.")
variant( variant(
"redirect", default=False, description="Redirect messages to stdout (instead of stderr)" "redirect", default=False, description="Redirect messages to stdout (instead of stderr)"
@ -79,14 +82,21 @@ def setup_build_environment(self, env):
env.append_path("LUA_PATH", stage_lua_path.format(version=self.version), separator=";") env.append_path("LUA_PATH", stage_lua_path.format(version=self.version), separator=";")
def patch(self): def patch(self):
"""The tcl scripts should use the tclsh that was discovered # The tcl scripts should use the tclsh that was discovered by the configure script.
by the configure script. Touch up their #! lines so that the # Touch up their #! lines so that the sed in the Makefile's install step has something to
sed in the Makefile's install step has something to work on. # work on. Requires the change in the associated patch file.fg
Requires the change in the associated patch file.fg"""
if self.spec.version <= Version("6.4.3"): if self.spec.version <= Version("6.4.3"):
for tclscript in glob("src/*.tcl"): for tclscript in glob("src/*.tcl"):
filter_file(r"^#!.*tclsh", "#!@path_to_tclsh@", tclscript) filter_file(r"^#!.*tclsh", "#!@path_to_tclsh@", tclscript)
# The build system hard-codes gsed on macOS, but that's a homebrew thing. We just have
# plain sed from the sed dependency. See https://github.com/TACC/Lmod/issues/742.
if self.spec.satisfies("platform=darwin"):
if self.spec.satisfies("@8.5.21:"):
filter_file("SED=gsed", "SED=sed", "rt/common_funcs.sh", string=True)
if self.spec.satisfies("@8.2:"):
filter_file(r"SED\s*:?=\s*gsed", "SED := sed", "Makefile.in")
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec
args = [] args = []