diff options
| author | Alexander Dahl <ada@thorsis.com> | 2020-05-05 10:28:12 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-08 10:54:22 +0200 |
| commit | 879f2c25a5a48791905a7b54642bff409a3d780b (patch) | |
| tree | adccdd61f73989fe9c56410c700e92ad9b509a0e | |
| parent | 9633ce1284fdc6f87dfc3ee2e1393780b4d86070 (diff) | |
| download | ptxdist-879f2c25a5a48791905a7b54642bff409a3d780b.tar.gz ptxdist-879f2c25a5a48791905a7b54642bff409a3d780b.tar.xz | |
json-c: version bump 0.13.1 -> 0.14
Quoting from the file 'ChangeLog':
> Build machinery has been switched to CMake.
The announcement is not clear about that however:
https://groups.google.com/forum/#!topic/json-c/yLwwAqiRf-4
Options are pinned like they were for the old autotools build (shared
lib, no threads, no rdrand) and what seemed to make sense in this build
environment.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
Message-Id: <20200505082812.22335-3-ada@thorsis.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/host-json-c.in | 1 | ||||
| -rw-r--r-- | rules/host-json-c.make | 17 | ||||
| -rw-r--r-- | rules/json-c.in | 1 | ||||
| -rw-r--r-- | rules/json-c.make | 21 |
4 files changed, 22 insertions, 18 deletions
diff --git a/rules/host-json-c.in b/rules/host-json-c.in index 569e21030..7354ae2d3 100644 --- a/rules/host-json-c.in +++ b/rules/host-json-c.in @@ -2,4 +2,5 @@ config HOST_JSON_C tristate + select HOST_CMAKE default y if ALLYES diff --git a/rules/host-json-c.make b/rules/host-json-c.make index f96a27fa1..8e607f783 100644 --- a/rules/host-json-c.make +++ b/rules/host-json-c.make @@ -15,14 +15,15 @@ HOST_PACKAGES-$(PTXCONF_HOST_JSON_C) += host-json-c # Prepare # ---------------------------------------------------------------------------- -# -# autoconf -# -HOST_JSON_C_CONF_TOOL := autoconf +HOST_JSON_C_CONF_TOOL := cmake HOST_JSON_C_CONF_OPT := \ - $(HOST_AUTOCONF) \ - --disable-threading \ - --disable-rdrand \ - --disable-static + $(HOST_CMAKE_OPT) \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + -DDISABLE_BSYMBOLIC:BOOL=ON \ + -DDISABLE_WERROR:BOOL=ON \ + -DENABLE_RDRAND:BOOL=OFF \ + -DENABLE_THREADING:BOOL=OFF # vim: syntax=make diff --git a/rules/json-c.in b/rules/json-c.in index ca4f1d500..a12fac01a 100644 --- a/rules/json-c.in +++ b/rules/json-c.in @@ -3,5 +3,6 @@ config JSON_C tristate prompt "json-c" + select HOST_CMAKE help json bindings in C diff --git a/rules/json-c.make b/rules/json-c.make index f6df25dba..f2a990bf4 100644 --- a/rules/json-c.make +++ b/rules/json-c.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_JSON_C) += json-c # # Paths and names # -JSON_C_VERSION := 0.13.1 -JSON_C_MD5 := 04969ad59cc37bddd83741a08b98f350 +JSON_C_VERSION := 0.14 +JSON_C_MD5 := 72cbb065b43376d825cd521d115ae1f6 JSON_C := json-c-$(JSON_C_VERSION) JSON_C_SUFFIX := tar.gz JSON_C_URL := https://s3.amazonaws.com/json-c_releases/releases/$(JSON_C).$(JSON_C_SUFFIX) @@ -28,15 +28,16 @@ JSON_C_LICENSE_FILES := file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2 # Prepare # ---------------------------------------------------------------------------- -# -# autoconf -# -JSON_C_CONF_TOOL := autoconf +JSON_C_CONF_TOOL := cmake JSON_C_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --disable-threading \ - --disable-rdrand \ - --disable-static + $(CROSS_CMAKE_USR) \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + -DDISABLE_BSYMBOLIC:BOOL=ON \ + -DDISABLE_WERROR:BOOL=ON \ + -DENABLE_RDRAND:BOOL=OFF \ + -DENABLE_THREADING:BOOL=OFF # ---------------------------------------------------------------------------- # Install |