From a7dc725e2d790b273d6ed47831213f06c2df887c Mon Sep 17 00:00:00 2001 From: sknigh Date: Fri, 12 Oct 2018 00:45:54 -0700 Subject: Ease nlohmann-json conflict with gcc 4.8 (#9506) --- var/spack/repos/builtin/packages/nlohmann-json/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') 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') -- cgit v1.2.3-70-g09d2