From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Jun 2025 21:32:56 +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 1uPnfU-006c0X-2w for lore@lore.pengutronix.de; Thu, 12 Jun 2025 21:32:56 +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 1uPnfU-00084c-NI; Thu, 12 Jun 2025 21:32:56 +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 1uPnef-0005tj-F6; Thu, 12 Jun 2025 21:32:05 +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 1uPnef-003AiH-0u; Thu, 12 Jun 2025 21:32:05 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1uPnef-009jpQ-0l; Thu, 12 Jun 2025 21:32:05 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 12 Jun 2025 21:32:05 +0200 Message-Id: <20250612193205.2321109-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250603090901.1066406-3-ada@thorsis.com> References: <20250603090901.1066406-3-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] jq: Make regex support optional 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: Alexander Dahl 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 b2e08feb25af2911a9fe83579fc8baaeefdd28e0. Michael [sent from post-receive hook] On Thu, 12 Jun 2025 21:32:05 +0200, Alexander Dahl 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 > Message-Id: <20250603090901.1066406-3-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > 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)