From 31577e783a86cc357ab4838cf14bc16fbe5bea83 Mon Sep 17 00:00:00 2001 From: Matthieu CRAPET Date: Thu, 31 Jul 2014 10:52:29 +0200 Subject: jq: upgrade to 1.4 Signed-off-by: Matthieu Crapet Signed-off-by: Martin Jansa --- .../jq/files/automake-once-fix.patch | 29 ---------------------- meta-oe/recipes-devtools/jq/jq_1.3.bb | 23 ----------------- meta-oe/recipes-devtools/jq/jq_1.4.bb | 22 ++++++++++++++++ 3 files changed, 22 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-devtools/jq/files/automake-once-fix.patch delete mode 100644 meta-oe/recipes-devtools/jq/jq_1.3.bb create mode 100644 meta-oe/recipes-devtools/jq/jq_1.4.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch b/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch deleted file mode 100644 index 0a1d1a222..000000000 --- a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Applied -https://github.com/stedolan/jq/commit/f0d1c39b5bbb4ccc517773eb635ba7f38ec7da1a - -Fixes build with automake-1.14 - -diff --git a/configure.ac b/configure.ac -index 76a49a9..d6d2d38 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ AC_INIT([jq], [1.3], [mu@netsoc.tcd.ie], - dnl Created autoconf implementation thompson@dtosolutions, 26NOV12 - AC_PREREQ([2.61]) - AC_CONFIG_AUX_DIR([config]) --AM_INIT_AUTOMAKE([parallel-tests foreign]) -+AM_INIT_AUTOMAKE([parallel-tests foreign -Wall]) - AM_SILENT_RULES([yes]) - AC_PROG_CC - AC_PROG_CC_STDC -@@ -66,7 +66,6 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"]) - - dnl AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE([-Wall]) - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT - --- -1.8.5.4 - diff --git a/meta-oe/recipes-devtools/jq/jq_1.3.bb b/meta-oe/recipes-devtools/jq/jq_1.3.bb deleted file mode 100644 index c58b47280..000000000 --- a/meta-oe/recipes-devtools/jq/jq_1.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Lightweight and flexible command-line JSON processor" -DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \ - filter and map and transform structured data with the same \ - ease that sed, awk, grep and friends let you play with text." -HOMEPAGE = "http://stedolan.github.io/jq/" -BUGTRACKER = "https://github.com/stedolan/jq/issues" -SECTION = "utils" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \ - file://automake-once-fix.patch \ -" -SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d" -SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7" - -inherit autotools - -# Don't build documentation (generation requires ruby) -EXTRA_OECONF = "--disable-docs" diff --git a/meta-oe/recipes-devtools/jq/jq_1.4.bb b/meta-oe/recipes-devtools/jq/jq_1.4.bb new file mode 100644 index 000000000..6e50803a3 --- /dev/null +++ b/meta-oe/recipes-devtools/jq/jq_1.4.bb @@ -0,0 +1,22 @@ +SUMMARY = "Lightweight and flexible command-line JSON processor" +DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \ + filter and map and transform structured data with the same \ + ease that sed, awk, grep and friends let you play with text." +HOMEPAGE = "http://stedolan.github.io/jq/" +BUGTRACKER = "https://github.com/stedolan/jq/issues" +SECTION = "utils" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653" + +DEPENDS = "flex-native bison-native" + +SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \ +" +SRC_URI[md5sum] = "e3c75a4f805bb5342c9f4b3603fb248f" +SRC_URI[sha256sum] = "998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d" + +inherit autotools + +# Don't build documentation (generation requires ruby) +EXTRA_OECONF = "--disable-docs" -- cgit v1.2.3-54-g00ecf