diff options
| author | sknigh <sknigh@sandia.gov> | 2018-10-12 00:45:54 -0700 |
|---|---|---|
| committer | Axel Huebl <axel.huebl@plasma.ninja> | 2018-10-12 09:45:54 +0200 |
| commit | a7dc725e2d790b273d6ed47831213f06c2df887c (patch) | |
| tree | 63a3fbed1aefad96853808ca6948db593650c50d /var | |
| parent | 2ae75702c0f8ded1e7b71a22d89c48e79ca6a3b1 (diff) | |
| download | spack-a7dc725e2d790b273d6ed47831213f06c2df887c.tar.gz spack-a7dc725e2d790b273d6ed47831213f06c2df887c.tar.bz2 spack-a7dc725e2d790b273d6ed47831213f06c2df887c.tar.xz spack-a7dc725e2d790b273d6ed47831213f06c2df887c.zip | |
Ease nlohmann-json conflict with gcc 4.8 (#9506)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/nlohmann-json/package.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/nlohmann-json/package.py b/var/spack/repos/builtin/packages/nlohmann-json/package.py index 9258810b62..dd37a9a8f0 100644 --- a/var/spack/repos/builtin/packages/nlohmann-json/package.py +++ b/var/spack/repos/builtin/packages/nlohmann-json/package.py @@ -43,8 +43,10 @@ class NlohmannJson(CMakePackage): depends_on('cmake@3.8:', type='build') # requires mature C++11 implementations - conflicts('%gcc@:4.8') - conflicts('%gcc@:3.3') + conflicts('%gcc@:4.7') + # v3.3.0 adds support for gcc 4.8 + # https://github.com/nlohmann/json/releases/tag/v3.3.0 + conflicts('%gcc@:4.8', when='@:3.2.9') conflicts('%intel@:16') conflicts('%pgi@:14') |