diff options
| author | Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> | 2021-10-13 21:14:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 12:14:37 -0700 |
| commit | 5782cb60838633cc57baf0d21eeb28936bf7a3d1 (patch) | |
| tree | eace55e540ca2495a8686bce56512df14b548622 | |
| parent | f4a132256a2eadf5586e2b758ff64de602c21d6e (diff) | |
| download | spack-5782cb60838633cc57baf0d21eeb28936bf7a3d1.tar.gz spack-5782cb60838633cc57baf0d21eeb28936bf7a3d1.tar.bz2 spack-5782cb60838633cc57baf0d21eeb28936bf7a3d1.tar.xz spack-5782cb60838633cc57baf0d21eeb28936bf7a3d1.zip | |
magics: Add v4.9.3 to fix build with gcc@11, skip broken testcase (#26695)
To build with gcc-11, v4.9.3 is needed, conflict added for older revs.
| -rw-r--r-- | var/spack/repos/builtin/packages/magics/package.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 19dd0cf940..a760886943 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -20,6 +20,7 @@ class Magics(CMakePackage): # The policy on which minor releases remain available and which get deleted # after a newer version becomes available is unclear. + version('4.9.3', sha256='c01ee7c4b05c5512e93e573748d2766d299fa1a60c226f2a0d0989f3d7c5239b') version('4.4.0', sha256='544058cd334f3e28a16d00ea7811e13cdf282f9c1ebec2ad7868171d925abd24') version('4.3.3', sha256='27d3de71cf41f3d557fd85dabaea2baaab34c4c6422a5b5b15071a6a53387601') version('4.3.1', sha256='b1995e2f5bf24943715446d1302cc5d7de4cacfe4cee7c3cfd1037ac183cd181') @@ -36,6 +37,8 @@ class Magics(CMakePackage): version('2.29.4', sha256='82bdb4f7e38776776d2155a82d0acaa017402365a043731708345ac4ac00198f') version('2.29.0', sha256='4c5067c4630e831bf81d15454476ff0d050c488b768f6a10272aad62ce8d0f92') + conflicts('%gcc@11:', when='@:4.4', msg='missing #include <limits>') + # The patch reorders includes and adds namespaces where necessary to # resolve ambiguity of invocations of isnan and isinf functions. The # patch is not needed since the version 2.29.1 @@ -129,6 +132,7 @@ class Magics(CMakePackage): os.path.basename( self.spec['python'].command.path)), pyfile) + filter_file('HAVE_GRIB', 'SKIP_REQUIRED_FILE_WASREMOVED', 'test/CMakeLists.txt') def cmake_args(self): args = [ |