From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Tue, 5 May 2020 09:06:45 +0200 From: Michael Olbrich Message-ID: <20200505070645.GA6501@pengutronix.de> References: <20200504114416.25444-1-ada@thorsis.com> <20200504114416.25444-3-ada@thorsis.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200504114416.25444-3-ada@thorsis.com> Subject: Re: [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Alexander Dahl On Mon, May 04, 2020 at 01:44:16PM +0200, Alexander Dahl wrote: > Quoting from the file 'ChangeLog': > > > Build machinery has been switched to CMake. Your need to select HOST_CMAKE for this. And the host-json-c needs updating as well. Michael > 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 > --- > 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 > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de