From 448ac2c68dc3d11331f7d20ab9b87d63fbabdb86 Mon Sep 17 00:00:00 2001 From: Matthieu Dorier Date: Tue, 20 Apr 2021 13:05:06 +0100 Subject: json-c: added two versions and converted to cmake package (#23129) --- var/spack/repos/builtin/packages/json-c/package.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/json-c/package.py b/var/spack/repos/builtin/packages/json-c/package.py index 56a7fe4a36..0c44e01c17 100644 --- a/var/spack/repos/builtin/packages/json-c/package.py +++ b/var/spack/repos/builtin/packages/json-c/package.py @@ -6,17 +6,19 @@ from spack import * -class JsonC(AutotoolsPackage): +class JsonC(CMakePackage): """A JSON implementation in C.""" homepage = "https://github.com/json-c/json-c/wiki" - url = "https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12.1.tar.gz" + url = "https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15.tar.gz" + version('0.15', sha256='b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6') + version('0.14', sha256='b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870') version('0.13.1', sha256='b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873') version('0.12.1', sha256='2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123') version('0.12', sha256='000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f') version('0.11', sha256='28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c') - depends_on('autoconf', type='build') + depends_on('autoconf', when='@:0.13.1', type='build') parallel = False @@ -26,3 +28,16 @@ class JsonC(AutotoolsPackage): '-Wextra -Wno-error=implicit-fallthrough ' '-Wno-error=unused-but-set-variable', 'Makefile.in') + + @when('@:0.13.1') + def cmake(self, spec, prefix): + configure_args = ['--prefix=' + prefix] + configure(*configure_args) + + @when('@:0.13.1') + def build(self, spec, prefix): + make() + + @when('@:0.13.1') + def install(self, spec, prefix): + make('install') -- cgit v1.2.3-70-g09d2