diff options
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/jq/files/automake-once-fix.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/jq/jq_1.4.bb (renamed from meta-oe/recipes-devtools/jq/jq_1.3.bb) | 5 |
2 files changed, 2 insertions, 32 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 0a1d1a222..000000000 --- a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | Upstream-Status: Applied | ||
2 | https://github.com/stedolan/jq/commit/f0d1c39b5bbb4ccc517773eb635ba7f38ec7da1a | ||
3 | |||
4 | Fixes build with automake-1.14 | ||
5 | |||
6 | diff --git a/configure.ac b/configure.ac | ||
7 | index 76a49a9..d6d2d38 100644 | ||
8 | --- a/configure.ac | ||
9 | +++ b/configure.ac | ||
10 | @@ -4,7 +4,7 @@ AC_INIT([jq], [1.3], [mu@netsoc.tcd.ie], | ||
11 | dnl Created autoconf implementation thompson@dtosolutions, 26NOV12 | ||
12 | AC_PREREQ([2.61]) | ||
13 | AC_CONFIG_AUX_DIR([config]) | ||
14 | -AM_INIT_AUTOMAKE([parallel-tests foreign]) | ||
15 | +AM_INIT_AUTOMAKE([parallel-tests foreign -Wall]) | ||
16 | AM_SILENT_RULES([yes]) | ||
17 | AC_PROG_CC | ||
18 | AC_PROG_CC_STDC | ||
19 | @@ -66,7 +66,6 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"]) | ||
20 | |||
21 | dnl AC_CONFIG_MACRO_DIR([m4]) | ||
22 | AC_CONFIG_HEADERS(config.h) | ||
23 | -AM_INIT_AUTOMAKE([-Wall]) | ||
24 | AC_CONFIG_FILES([Makefile]) | ||
25 | AC_OUTPUT | ||
26 | |||
27 | -- | ||
28 | 1.8.5.4 | ||
29 | |||
diff --git a/meta-oe/recipes-devtools/jq/jq_1.3.bb b/meta-oe/recipes-devtools/jq/jq_1.4.bb index c58b47280..6e50803a3 100644 --- a/meta-oe/recipes-devtools/jq/jq_1.3.bb +++ b/meta-oe/recipes-devtools/jq/jq_1.4.bb | |||
@@ -12,10 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653" | |||
12 | DEPENDS = "flex-native bison-native" | 12 | DEPENDS = "flex-native bison-native" |
13 | 13 | ||
14 | SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \ | 14 | SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \ |
15 | file://automake-once-fix.patch \ | ||
16 | " | 15 | " |
17 | SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d" | 16 | SRC_URI[md5sum] = "e3c75a4f805bb5342c9f4b3603fb248f" |
18 | SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7" | 17 | SRC_URI[sha256sum] = "998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d" |
19 | 18 | ||
20 | inherit autotools | 19 | inherit autotools |
21 | 20 | ||