[oe-commits] Matthieu CRAPET : jq: upgrade to 1.4

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 31250e382654dc1b1070a21e52d9affbce79d77b
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=31250e382654dc1b1070a21e52d9affbce79d77b

Author: Matthieu CRAPET <Matthieu.CRAPET at ingenico.com>
Date:   Tue Jul 29 14:40:09 2014 +0200

jq: upgrade to 1.4

Signed-off-by: Matthieu Crapet <Matthieu.Crapet at ingenico.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../jq/files/automake-once-fix.patch               | 29 ----------------------
 .../recipes-devtools/jq/{jq_1.3.bb => jq_1.4.bb}   |  0
 2 files changed, 29 deletions(-)

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 0a1d1a2..0000000
--- 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 at netsoc.tcd.ie],
- dnl Created autoconf implementation thompson at 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.4.bb
similarity index 100%
rename from meta-oe/recipes-devtools/jq/jq_1.3.bb
rename to meta-oe/recipes-devtools/jq/jq_1.4.bb