diff --git a/package/jq/Config.in b/package/jq/Config.in index 5edb5d0989..ed2e0fa34f 100644 --- a/package/jq/Config.in +++ b/package/jq/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_JQ filter and map and transform structured data with the same ease that sed, awk, grep and friends let you play with text. - http://stedolan.github.io/jq/ + https://jqlang.github.io/jq/ comment "jq needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/jq/jq.hash b/package/jq/jq.hash index 125781385c..6c2db98e87 100644 --- a/package/jq/jq.hash +++ b/package/jq/jq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 20249104d4df2247253df6df4a980b8be1f5232f03fef7cd41bacb7e6eab04fd jq-a17dd3248a666d01be75f6b16be37e80e20b0954.tar.gz -sha256 c8437d414ca5b394718784c3bf5bdff7f01fee417625fabf1fb722ca263037da COPYING +sha256 402a0d6975d946e6f4e484d1a84320414a0ff8eb6cf49d2c11d144d4d344db62 jq-1.7.tar.gz +sha256 10e974638a41fadfd72357f2f3a4325e20b856c563365128f72feaa406f8c92d COPYING diff --git a/package/jq/jq.mk b/package/jq/jq.mk index 7f890f8998..d886459dcc 100644 --- a/package/jq/jq.mk +++ b/package/jq/jq.mk @@ -4,25 +4,18 @@ # ################################################################################ -JQ_VERSION = a17dd3248a666d01be75f6b16be37e80e20b0954 -JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION)) +JQ_VERSION = 1.7 +JQ_SITE = https://github.com/jqlang/jq/releases/download/jq-$(JQ_VERSION) JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING JQ_CPE_ID_VENDOR = jq_project JQ_INSTALL_STAGING = YES -# currently using git version directly -JQ_AUTORECONF = YES - # uses c99 specific features -# _GNU_SOURCE added to fix gcc6+ host compilation -# (https://github.com/stedolan/jq/issues/1598) -JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE" -HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99 -D_GNU_SOURCE" +JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" +HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99" -# jq explicitly enables maintainer mode, which we don't need/want -JQ_CONF_OPTS += --disable-maintainer-mode -HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma +HOST_JQ_CONF_OPTS += --without-oniguruma ifeq ($(BR2_PACKAGE_ONIGURUMA),y) JQ_DEPENDENCIES += oniguruma