diff options
| author | Tiziano Müller <tiziano.mueller@hpe.com> | 2021-12-02 03:29:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 18:29:23 -0800 |
| commit | d0beab80128fe53bf6c486b029c40e4935570c89 (patch) | |
| tree | 6bad3ac67452b2c437a7694025d3ada93cffe448 | |
| parent | 04519d261d017536b709f8c4dcf61bcbd7e3b4e5 (diff) | |
| download | spack-d0beab80128fe53bf6c486b029c40e4935570c89.tar.gz spack-d0beab80128fe53bf6c486b029c40e4935570c89.tar.bz2 spack-d0beab80128fe53bf6c486b029c40e4935570c89.tar.xz spack-d0beab80128fe53bf6c486b029c40e4935570c89.zip | |
elpa package: add version 2021.05.002_bugfix (#27748)
* elpa: filter _bugfix in version for include dir
* libxc: add version 5.1.7
| -rw-r--r-- | var/spack/repos/builtin/packages/elpa/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libxc/package.py | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index 001f9c21f4..70aa378f86 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -14,6 +14,7 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): homepage = 'https://elpa.mpcdf.mpg.de/' url = 'https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/2015.11.001/elpa-2015.11.001.tar.gz' + version('2021.05.002_bugfix', sha256='deabc48de5b9e4b2f073d749d335c8f354a7ce4245b643a23b7951cd6c90224b') version('2021.05.001', sha256='a4f1a4e3964f2473a5f8177f2091a9da5c6b5ef9280b8272dfefcbc3aad44d41') version('2020.05.001', sha256='66ff1cf332ce1c82075dc7b5587ae72511d2bcb3a45322c94af6b01996439ce5') version('2019.11.001', sha256='10374a8f042e23c7e1094230f7e2993b6f3580908a213dbdf089792d05aff357') @@ -66,10 +67,17 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): @property def headers(self): suffix = '_openmp' if self.spec.satisfies('+openmp') else '' + + # upstream sometimes adds tarball suffixes not part of the internal version + elpa_version = str(self.spec.version) + for vsuffix in ("_bugfix", ): + if elpa_version.endswith(vsuffix): # implementation of py3.9 removesuffix + elpa_version = elpa_version[:-len(vsuffix)] + incdir = os.path.join( self.spec.prefix.include, - 'elpa{suffix}-{version!s}'.format( - suffix=suffix, version=self.spec.version)) + 'elpa{suffix}-{version}'.format( + suffix=suffix, version=elpa_version)) hlist = find_all_headers(incdir) hlist.directories = [incdir] diff --git a/var/spack/repos/builtin/packages/libxc/package.py b/var/spack/repos/builtin/packages/libxc/package.py index cdfcc52433..cfbbd953e8 100644 --- a/var/spack/repos/builtin/packages/libxc/package.py +++ b/var/spack/repos/builtin/packages/libxc/package.py @@ -13,6 +13,7 @@ class Libxc(AutotoolsPackage, CudaPackage): homepage = "https://tddft.org/programs/libxc/" url = "https://www.tddft.org/programs/libxc/down.php?file=2.2.2/libxc-2.2.2.tar.gz" + version('5.1.7', sha256='1a818fdfe5c5f74270bc8ef0c59064e8feebcd66b8f642c08aecc1e7d125be34') version('5.1.5', sha256='02e4615a22dc3ec87a23efbd3d9be5bfad2445337140bad1720699571c45c3f9') version('5.1.3', sha256='0350defdd6c1b165e4cf19995f590eee6e0b9db95a6b221d28cecec40f4e85cd') version('5.1.2', sha256='180d52b5552921d1fac8a10869dd30708c0fb41dc202a3bbee0e36f43872718a') |