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

environment-modules: add version 5.0.0 (#25904)

Browse Source 
Adapt configure arguments to only keep useful ones for this new major
release version.
This commit is contained in:
Xavier Delaruelle 2021-09-13 07:58:40 +02:00 committed by GitHub
parent 0545f7d5cc
commit e0d8f67f34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
var/spack/repos/builtin/packages/environment-modules/package.py
View File

@ -10,10 +10,11 @@ class EnvironmentModules(Package):
""" """
homepage = 'https://cea-hpc.github.io/modules/' homepage = 'https://cea-hpc.github.io/modules/'
url = 'https://github.com/cea-hpc/modules/releases/download/v4.8.0/modules-4.8.0.tar.gz' url = 'https://github.com/cea-hpc/modules/releases/download/v5.0.0/modules-5.0.0.tar.gz'
maintainers = ['xdelaruelle'] maintainers = ['xdelaruelle']
version('5.0.0', sha256='428e23ac51a6006605de65ed9114d544a5506cb4b6bfb03d8522778f13e4f7ea')
version('4.8.0', sha256='d6b45cadc2146ed5e0b25a96d44643ad516054eb7745acb14a1dc7bf30744f6e') version('4.8.0', sha256='d6b45cadc2146ed5e0b25a96d44643ad516054eb7745acb14a1dc7bf30744f6e')
version('4.7.1', sha256='ee7ecd62bbbde6d51e30788a97800c39e72515b6a910839fb84041b35ba42b4d') version('4.7.1', sha256='ee7ecd62bbbde6d51e30788a97800c39e72515b6a910839fb84041b35ba42b4d')
version('4.7.0', sha256='3ab0a649e23b4dd00963e4cae60e573b449194ecb4035c5ce487330b272b4d06') version('4.7.0', sha256='3ab0a649e23b4dd00963e4cae60e573b449194ecb4035c5ce487330b272b4d06')
@ -48,19 +49,14 @@ class EnvironmentModules(Package):
# Dependencies: # Dependencies:
depends_on('tcl', type=('build', 'link', 'run')) depends_on('tcl', type=('build', 'link', 'run'))
depends_on('tcl@8.4:', type=('build', 'link', 'run'), when='@4.0.0:') depends_on('tcl@8.4:', type=('build', 'link', 'run'), when='@4.0.0:4.8')
depends_on('tcl@8.5:', type=('build', 'link', 'run'), when='@5.0.0:')
def install(self, spec, prefix): def install(self, spec, prefix):
tcl = spec['tcl'] tcl = spec['tcl']
config_args = [ config_args = [
"--prefix=" + prefix, "--prefix=" + prefix,
"--without-tclx",
"--with-tclx-ver=0.0",
# It looks for tclConfig.sh
"--with-tcl=" + tcl.libs.directories[0],
"--with-tcl-ver={0}".format(tcl.version.up_to(2)),
'--disable-versioning',
'--datarootdir=' + prefix.share '--datarootdir=' + prefix.share
] ]
@ -75,19 +71,19 @@ def install(self, spec, prefix):
if '~X' in spec: if '~X' in spec:
config_args = ['--without-x'] + config_args config_args = ['--without-x'] + config_args
if '@4.4.0:' in self.spec: if '@4.4.0:4.8' in self.spec:
config_args.extend([ config_args.extend([
'--with-icase=search', '--with-icase=search',
'--enable-extended-default', '--enable-extended-default',
'--enable-advanced-version-spec' '--enable-advanced-version-spec'
]) ])
if '@4.3.0:' in self.spec: if '@4.3.0:4.8' in self.spec:
config_args.extend([ config_args.extend([
'--enable-color' '--enable-color'
]) ])
if '@4.2.0:' in self.spec: if '@4.2.0:4.8' in self.spec:
config_args.extend([ config_args.extend([
'--enable-auto-handling' '--enable-auto-handling'
]) ])
@ -100,9 +96,13 @@ def install(self, spec, prefix):
'--with-quarantine-vars=LD_LIBRARY_PATH LD_PRELOAD' '--with-quarantine-vars=LD_LIBRARY_PATH LD_PRELOAD'
]) ])
if '@4.0.0:4.8' in self.spec:
config_args.extend([
'--disable-compat-version'
])
if '@4.0.0:' in self.spec: if '@4.0.0:' in self.spec:
config_args.extend([ config_args.extend([
'--disable-compat-version',
'--with-tclsh={0}'.format(tcl.prefix.bin.tclsh) '--with-tclsh={0}'.format(tcl.prefix.bin.tclsh)
]) ])
@ -113,6 +113,16 @@ def install(self, spec, prefix):
'CPPFLAGS=-DUSE_INTERP_ERRORLINE' 'CPPFLAGS=-DUSE_INTERP_ERRORLINE'
]) ])
if '@:3.2' in self.spec:
config_args.extend([
"--without-tclx",
"--with-tclx-ver=0.0",
# It looks for tclConfig.sh
"--with-tcl=" + tcl.libs.directories[0],
"--with-tcl-ver={0}".format(tcl.version.up_to(2)),
'--disable-versioning'
])
configure(*config_args) configure(*config_args)
make() make()
make('install') make('install')