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 <[email protected]> --- 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
