jq: upgrade to 1.4

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Matthieu CRAPET
2014-07-31 10:52:29 +02:00
committed by Martin Jansa
parent 87842d3f69
commit 31577e783a
2 changed files with 2 additions and 32 deletions

View File

@@ -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

View File

@@ -12,10 +12,9 @@ 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"
SRC_URI[md5sum] = "e3c75a4f805bb5342c9f4b3603fb248f"
SRC_URI[sha256sum] = "998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d"
inherit autotools