Re: [ptxdist] [APPLIED] jq: Make regex support optional

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as b2e08feb25af2911a9fe83579fc8baaeefdd28e0.

Michael

[sent from post-receive hook]

On Thu, 12 Jun 2025 21:32:05 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Initially the jq package had this turned off, it was turned on later.
> Make it optional now to simplify license handling with libonig and fix
> the build with the upcoming version bump to jq 1.8.0.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20250603090901.1066406-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/jq.in b/rules/jq.in
> index 03354642b4a9..0e30fbceb49c 100644
> --- a/rules/jq.in
> +++ b/rules/jq.in
> @@ -1,9 +1,21 @@
>  ## SECTION=shell_and_console
>  
> -config JQ
> +menuconfig JQ
>  	tristate
> -	prompt "jq"
> +	prompt "jq                            "
> +	select LIBONIG if JQ_REGEX
>  	help
>  	  lightweight and flexible command-line JSON processor
>  
> +if JQ
> +
> +config JQ_REGEX
> +	bool
> +	prompt "regular expression support"
> +	default y
> +	help
> +	  Optional support for match/test/sub and related functions.
> +
> +endif
> +
>  # vim: ft=kconfig noet tw=72
> diff --git a/rules/jq.make b/rules/jq.make
> index 4f7ca95ad20a..f1f7fc6f886f 100644
> --- a/rules/jq.make
> +++ b/rules/jq.make
> @@ -43,7 +43,7 @@ JQ_CONF_OPT	:= \
>  	--disable-error-injection \
>  	--disable-all-static \
>  	--disable-decnum \
> -	--with-oniguruma=prefix
> +	--$(call ptx/wwo, PTXCONF_JQ_REGEX)-oniguruma
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -59,7 +59,6 @@ $(STATEDIR)/jq.targetinstall:
>  	@$(call install_fixup, jq,DESCRIPTION,missing)
>  
>  	@$(call install_lib, jq, 0, 0, 0644, libjq)
> -	@$(call install_lib, jq, 0, 0, 0644, libonig)
>  	@$(call install_copy, jq, 0, 0, 0755, -, /usr/bin/jq)
>  
>  	@$(call install_finish, jq)