From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 19 Oct 2025 14:05:54 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vASAc-009X8N-1n for lore@lore.pengutronix.de; Sun, 19 Oct 2025 14:05:54 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vASAc-00050F-40; Sun, 19 Oct 2025 14:05:54 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vASAB-0003wk-RB; Sun, 19 Oct 2025 14:05:27 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vASAB-004NUv-24; Sun, 19 Oct 2025 14:05:27 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vASAB-00000002kjB-2Stb; Sun, 19 Oct 2025 14:05:27 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sun, 19 Oct 2025 14:05:27 +0200 Message-ID: <20251019120527.656270-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251015130411.3331026-1-s.pueschel@pengutronix.de> References: <20251015130411.3331026-1-s.pueschel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] jansson: version bump 2.13.1 -> 2.14.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 3502c924af040cdedfb9b3f6d990e766578b0d48. Michael [sent from post-receive hook] On Sun, 19 Oct 2025 14:05:27 +0200, Sven Püschel wrote: > Version 2.14.1 added the dtoa source and the corresponding license. > Follow the default settings and enable it. > > The sources are no longer published on the old URL. It now redirects > to GitHub. Also switch to CMake as a build system. > > https://github.com/akheron/jansson/releases/tag/v2.14 > https://github.com/akheron/jansson/releases/tag/v2.14.1 > > Signed-off-by: Sven Püschel > Message-Id: <20251015130411.3331026-1-s.pueschel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/jansson.in b/rules/jansson.in > index bf6ae6d9297d..6c9d363bf35e 100644 > --- a/rules/jansson.in > +++ b/rules/jansson.in > @@ -2,6 +2,7 @@ > > config JANSSON > tristate > + select HOST_CMAKE > prompt "jansson" > help > C-Library for encoding, decoding and manipulating JSON data. > diff --git a/rules/jansson.make b/rules/jansson.make > index e4ee7dcadb6e..0b8854d86126 100644 > --- a/rules/jansson.make > +++ b/rules/jansson.make > @@ -14,27 +14,34 @@ PACKAGES-$(PTXCONF_JANSSON) += jansson > # > # Paths and names > # > -JANSSON_VERSION := 2.13.1 > -JANSSON_MD5 := e343e5b2e8fac568a00a8ca36dc01ebe > +JANSSON_VERSION := 2.14.1 > +JANSSON_MD5 := 6a4307413fedc78342b5555cec9474a0 > JANSSON := jansson-$(JANSSON_VERSION) > -JANSSON_SUFFIX := tar.bz2 > -JANSSON_URL := http://www.digip.org/jansson/releases/$(JANSSON).$(JANSSON_SUFFIX) > +JANSSON_SUFFIX := tar.gz > +JANSSON_URL := https://github.com/akheron/jansson/archive/refs/tags/v$(JANSSON_VERSION).$(JANSSON_SUFFIX) > JANSSON_SOURCE := $(SRCDIR)/$(JANSSON).$(JANSSON_SUFFIX) > JANSSON_DIR := $(BUILDDIR)/lib$(JANSSON) > -JANSSON_LICENSE := MIT > +JANSSON_LICENSE := MIT AND dtoa > +JANSSON_LICENSE_FILES := \ > + file://LICENSE;md5=d9911525d4128bee234ee2d3ccaa2537 \ > + file://src/jansson.h;startline=1;endline=6;md5=46863262fe45ff28360cdf0aecc2264e \ > + file://src/dtoa.c;startline=2;endline=19;md5=0893720de1a2e17053089dc16f743e11 > > # ---------------------------------------------------------------------------- > # Prepare > # ---------------------------------------------------------------------------- > > -# > -# autoconf > -# > - > -JANSSON_CONF_TOOL := autoconf > +JANSSON_CONF_TOOL := cmake > JANSSON_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-windows-cryptoapi > + $(CROSS_CMAKE_USR) \ > + -DJANSSON_BUILD_DOCS=OFF \ > + -DJANSSON_BUILD_SHARED_LIBS=ON \ > + -DJANSSON_COVERAGE=OFF \ > + -DJANSSON_EXAMPLES=OFF \ > + -DJANSSON_INSTALL=ON \ > + -DJANSSON_WITHOUT_TESTS=ON \ > + -DUSE_DTOA=ON \ > + -DUSE_URANDOM=ON > > # ---------------------------------------------------------------------------- > # Target-Install