mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] jansson: version bump 2.13.1 -> 2.14.1
@ 2025-10-15 13:03 Sven Püschel
  2025-10-19 12:05 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Sven Püschel @ 2025-10-15 13:03 UTC (permalink / raw)
  To: ptxdist; +Cc: Sven Püschel

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 <s.pueschel@pengutronix.de>
---
 rules/jansson.in   |  1 +
 rules/jansson.make | 31 +++++++++++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/rules/jansson.in b/rules/jansson.in
index bf6ae6d92..6c9d363bf 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 e4ee7dcad..0b8854d86 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
-- 
2.47.3




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] jansson: version bump 2.13.1 -> 2.14.1
  2025-10-15 13:03 [ptxdist] [PATCH] jansson: version bump 2.13.1 -> 2.14.1 Sven Püschel
@ 2025-10-19 12:05 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2025-10-19 12:05 UTC (permalink / raw)
  To: ptxdist; +Cc: Sven Püschel

Thanks, applied as 3502c924af040cdedfb9b3f6d990e766578b0d48.

Michael

[sent from post-receive hook]

On Sun, 19 Oct 2025 14:05:27 +0200, Sven Püschel <s.pueschel@pengutronix.de> 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 <s.pueschel@pengutronix.de>
> Message-Id: <20251015130411.3331026-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-10-19 12:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-15 13:03 [ptxdist] [PATCH] jansson: version bump 2.13.1 -> 2.14.1 Sven Püschel
2025-10-19 12:05 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox