From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 03 Jun 2025 11:09:33 +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 1uMNeH-003Foa-2Z for lore@lore.pengutronix.de; Tue, 03 Jun 2025 11:09:33 +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 1uMNeH-0004v3-6t; Tue, 03 Jun 2025 11:09:33 +0200 Received: from mail.thorsis.com ([217.92.40.78]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1uMNdr-0004Pb-IF for ptxdist@pengutronix.de; Tue, 03 Jun 2025 11:09:09 +0200 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E0BEC1481346; Tue, 3 Jun 2025 11:09:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=dkim; t=1748941747; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=nN0WIT5Ua71ZJkJq82GFi377oYG4t0Xo0f+CQKEkmaw=; b=tKy+tUASBvUusU3gjCI4wL8In3cf87JXKQ6Ai3uonDgnJFMxZieJYpf1IgKJxB3eTUZZAK 5DWK9DxP5byZ3CA/+B53ERtq9lQOXJSJj1sp5E//OK5NuOFbjzGFdCbRdFZ3HmXFkTZwnC LTZ0p/yyFwYQdT36iZjxS4/v2YjbO2B2XKGCCbG9Tjre16UMs5g3kAtmAxVHBLw8Pnb4RN UAzF2VIs3lbHFLI+n4j7djbFvNjJdVMIjyNeCpts0k+nHHmCUPhyDI9KG1ITk+bfsQQjdp fUVVwYkB+F0DeyoDTIT7z0tahw/ASfFWiOmHGM4cw2tWavJrY2sEpCv/YtrPhg== To: ptxdist@pengutronix.de Date: Tue, 3 Jun 2025 11:09:00 +0200 Message-Id: <20250603090901.1066406-3-ada@thorsis.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250603090901.1066406-1-ada@thorsis.com> References: <20250603090901.1066406-1-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.3 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2 2/3] 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: , From: Alexander Dahl via ptxdist Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl , Andreas Helmcke 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 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 --- rules/jq.in | 16 ++++++++++++++-- rules/jq.make | 3 +-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/rules/jq.in b/rules/jq.in index 03354642b..0e30fbceb 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 4f7ca95ad..f1f7fc6f8 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) -- 2.39.5