diff options
| author | Stephen McDowell <svenevs@users.noreply.github.com> | 2020-04-28 12:14:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 11:14:36 -0500 |
| commit | 4ed5cee9408cbeedd5764c6d165743981e40bb9e (patch) | |
| tree | 5ae37df3d66c7f9ba43395c32d328991247fbed6 /var | |
| parent | af9c3b31de930ceb3a54b352829b6f731b35a8f5 (diff) | |
| download | spack-4ed5cee9408cbeedd5764c6d165743981e40bb9e.tar.gz spack-4ed5cee9408cbeedd5764c6d165743981e40bb9e.tar.bz2 spack-4ed5cee9408cbeedd5764c6d165743981e40bb9e.tar.xz spack-4ed5cee9408cbeedd5764c6d165743981e40bb9e.zip | |
jsoncpp add 1.9.2, patch %clang@10 for implicit conversion (#16153)
* add 1.9.2, patch %clang@10 for implicit conversion
* flake8: "fix" hanging indent (squash: because is that really more readable?)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/jsoncpp/package.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/jsoncpp/package.py b/var/spack/repos/builtin/packages/jsoncpp/package.py index 546ea104f2..2593c9ae0f 100644 --- a/var/spack/repos/builtin/packages/jsoncpp/package.py +++ b/var/spack/repos/builtin/packages/jsoncpp/package.py @@ -15,6 +15,7 @@ class Jsoncpp(CMakePackage): homepage = "https://github.com/open-source-parsers/jsoncpp" url = "https://github.com/open-source-parsers/jsoncpp/archive/1.7.3.tar.gz" + version('1.9.2', sha256='77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0') version('1.9.1', sha256='c7b40f5605dd972108f503f031b20186f5e5bca2b65cd4b8bd6c3e4ba8126697') version('1.9.0', sha256='bdd3ba9ed1f110b3eb57474d9094e90ab239b93b4803b4f9b1722c281e85a4ac') version('1.8.4', sha256='c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6') @@ -42,6 +43,17 @@ class Jsoncpp(CMakePackage): depends_on('cmake@3.1:', type='build') depends_on('python', type='test') + # Ref: https://github.com/open-source-parsers/jsoncpp/pull/1023 + # Released in 1.9.2, patch does not apply cleanly across releases. + # May apply to more compilers in the future. + @when('@:1.9.1 %clang@10.0.0:') + def patch(self): + filter_file( + 'return d >= min && d <= max;', + 'return d >= static_cast<double>(min) && ' + 'd <= static_cast<double>(max);', + 'src/lib_json/json_value.cpp') + def cmake_args(self): args = ['-DBUILD_SHARED_LIBS=ON'] cxxstd = self.spec.variants['cxxstd'].value |