summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Cessenat <cessenat@gmail.com>2021-10-25 16:13:54 +0200
committerGitHub <noreply@github.com>2021-10-25 08:13:54 -0600
commitb51e0b363e1b051ed29ab49e59b6f43d418eddcf (patch)
tree9fb04f8b4e4423076b43dfd63c5be5a598ff531c
parente9740a9978d71aa3c6876bdb88dc504175966fd4 (diff)
downloadspack-b51e0b363e1b051ed29ab49e59b6f43d418eddcf.tar.gz
spack-b51e0b363e1b051ed29ab49e59b6f43d418eddcf.tar.bz2
spack-b51e0b363e1b051ed29ab49e59b6f43d418eddcf.tar.xz
spack-b51e0b363e1b051ed29ab49e59b6f43d418eddcf.zip
silo: new release 4.11 (#26876)
-rw-r--r--var/spack/repos/builtin/packages/silo/package.py19
1 files changed, 17 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py
index 39df0ed56c..3f082a6753 100644
--- a/var/spack/repos/builtin/packages/silo/package.py
+++ b/var/spack/repos/builtin/packages/silo/package.py
@@ -14,6 +14,10 @@ class Silo(AutotoolsPackage):
homepage = "https://wci.llnl.gov/simulation/computer-codes/silo"
url = "https://wci.llnl.gov/sites/wci/files/2021-01/silo-4.10.2.tgz"
+ version('4.11', sha256='ab936c1f4fc158d9fdc4415965f7d9def7f4abeca596fe5a25bd8485654898ac',
+ url="https://github.com/LLNL/Silo/releases/download/v4.11/silo-4.11.tar.gz")
+ version('4.11-bsd', sha256='6d0a85a079d48fcdcc0084ecb5fc4cfdcc64852edee780c60cb244d16f4bc4ec',
+ url="https://github.com/LLNL/Silo/releases/download/v4.11/silo-4.11-bsd.tar.gz")
version('4.10.2', sha256='3af87e5f0608a69849c00eb7c73b11f8422fa36903dd14610584506e7f68e638', preferred=True)
version('4.10.2-bsd', sha256='4b901dfc1eb4656e83419a6fde15a2f6c6a31df84edfad7f1dc296e01b20140e',
url="https://wci.llnl.gov/sites/wci/files/2021-01/silo-4.10.2-bsd.tgz")
@@ -50,7 +54,12 @@ class Silo(AutotoolsPackage):
depends_on('zlib')
patch('remove-mpiposix.patch', when='@4.8:4.10.2')
- patch('H5FD_class_t-terminate.patch', when='^hdf5@1.10.0:')
+ patch('H5FD_class_t-terminate.patch', when='@:4.10.2 ^hdf5@1.10.0:')
+
+ conflicts('+hzip', when="@4.11-bsd")
+ conflicts('+fpzip', when="@4.11-bsd")
+ conflicts('+hzip', when="@4.10.2-bsd")
+ conflicts('+fpzip', when="@4.10.2-bsd")
def flag_handler(self, name, flags):
spec = self.spec
@@ -67,6 +76,9 @@ class Silo(AutotoolsPackage):
flags.append(self.compiler.cxx_pic_flag)
elif name == 'fcflags':
flags.append(self.compiler.fc_pic_flag)
+ if name == 'cflags':
+ if spec.compiler.name in ['clang', 'apple-clang']:
+ flags.append('-Wno-implicit-function-declaration')
return (flags, None, None)
@when('%clang@9:')
@@ -110,7 +122,10 @@ class Silo(AutotoolsPackage):
def force_autoreconf(self):
# Update autoconf's tests whether libtool supports shared libraries.
# (Otherwise, shared libraries are always disabled on Darwin.)
- return self.spec.satisfies('+shared')
+ if self.spec.satisfies('@4.11-bsd') or self.spec.satisfies('@4.10.2-bsd'):
+ return False
+ else:
+ return self.spec.satisfies('+shared')
def configure_args(self):
spec = self.spec