mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14
Date: Mon,  4 May 2020 13:44:16 +0200	[thread overview]
Message-ID: <20200504114416.25444-3-ada@thorsis.com> (raw)
In-Reply-To: <20200504114416.25444-1-ada@thorsis.com>

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>
---
 rules/json-c.make | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

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
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  parent reply	other threads:[~2020-05-04 11:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-04 11:44 [ptxdist] [PATCH 0/2] " Alexander Dahl
2020-05-04 11:44 ` [ptxdist] [PATCH 1/2] json-c: Revert URL to upstream provided tarballs Alexander Dahl
2020-05-04 11:44 ` Alexander Dahl [this message]
2020-05-05  7:06   ` [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14 Michael Olbrich
2020-05-05  7:10     ` Alexander Dahl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200504114416.25444-3-ada@thorsis.com \
    --to=ada@thorsis.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox