Skip to contentSkip to conversation

package/jq: bump to git version a97638713ad3 (still 1.6-based)

PATCH New Thomas De Schampheleire 2 participants 2 messages Dec 20, 2019 – Dec 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/jq: bump to git version a97638713ad3 (still 1.6-based)

From: Thomas De Schampheleire <[email protected]>

jq 1.6 has a severe performance regression compared to 1.5. The problem is reported [1] and fixed [2] upstream, but there are different commits and later subsequent fixes on top of them that make it cumbersome to patch specifically.

Instead, bump to a recent git version.

[1] https://github.com/stedolan/jq/issues/1826
[2] https://github.com/stedolan/jq/pull/1834

---
 package/jq/jq.hash | 2 +-
 package/jq/jq.mk   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

Note: when I wrote the patch initially, I chose latest master. Now when I'm preparing it for upstreaming, there are a few more commits on master. I'm _not_ including them now as we did not test with it.

package/jq/jq.hash +1 -1
index 449619b024..2cddda32c6 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72  jq-1.6.tar.gz
+sha256  3002cf80d871728562989b4a47d90a7301fe049a4e1d69836b99108f198dac06  jq-a97638713ad30653d424f136018098c4b0e5c71b.tar.gz
 sha256  111136aebcbfa68b6b0084e582b30e981da76adcff84eab6f9be32a1f38c5bf1  COPYING
package/jq/jq.mk +5 -2
index bf96f0cecb..3d22306537 100644
@@ -4,12 +4,15 @@
 #
 ################################################################################
 
-JQ_VERSION = 1.6
-JQ_SITE = https://github.com/stedolan/jq/releases/download/jq-$(JQ_VERSION)
+JQ_VERSION = a97638713ad30653d424f136018098c4b0e5c71b
+JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION))
 JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation)
 JQ_LICENSE_FILES = COPYING
 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)
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/jq: bump to git version a97638713ad3 (still 1.6-based)

Quoted 9 lines · On Fri, 20 Dec 2019 21:27:28 +0100 Thomas De Schampheleire…

From: Thomas De Schampheleire <[email protected]>

jq 1.6 has a severe performance regression compared to 1.5. The problem is reported [1] and fixed [2] upstream, but there are different commits and later subsequent fixes on top of them that make it cumbersome to patch specifically.

Instead, bump to a recent git version.

Quoted 8 lines

[1] https://github.com/stedolan/jq/issues/1826
[2] https://github.com/stedolan/jq/pull/1834

---
 package/jq/jq.hash | 2 +-
 package/jq/jq.mk   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com