summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-31 17:52:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:31 +0100
commit3ff9578ec44af9ce68befddbbf512490be9c4024 (patch)
tree9e3b2602c59bcc500d942e29875b2c6758832721 /meta
parent6c6bf5ef9b1f16d0d4a40a62de58f486a48686f7 (diff)
downloadpoky-3ff9578ec44af9ce68befddbbf512490be9c4024.tar.gz
json-c: update 0.13.1 - > 0.14
(From OE-Core rev: caf64f85b5c57d886f3c4e5f295b12d93dd6c384) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch45
-rw-r--r--meta/recipes-devtools/json-c/json-c_0.14.bb (renamed from meta/recipes-devtools/json-c/json-c_0.13.1.bb)11
2 files changed, 3 insertions, 53 deletions
diff --git a/meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch b/meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch
deleted file mode 100644
index 0c20c8458a..0000000000
--- a/meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1json-c: Backport --disable-werror patch to allow compilation under icecc
2
3icecc preprocesses source files locally before shipping them off to be compiled
4on remote hosts. This preprocessing removes comments, including /* fallthough */
5comments in switch statements that normally prevent an implicit-fallthrough
6warning, see https://github.com/icecc/icecream/issues/419
7
8Rather than turning off -Werror, the upstream project has implemented a
9configure option, --disable-werror, in response to Ross's
10https://github.com/json-c/json-c/issues/489
11
12This patch from
13https://github.com/json-c/json-c/commit/21c886534f8927fdc0fb5f8647394f3e0e0874b8
14
15Upstream-Status: Backport [Not yet released]
16Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
17
18From 21c886534f8927fdc0fb5f8647394f3e0e0874b8 Mon Sep 17 00:00:00 2001
19From: Pierce Lopez <pierce.lopez@gmail.com>
20Date: Sun, 9 Jun 2019 10:52:08 -0400
21Subject: [PATCH] build: add --disable-werror option to configure
22
23to omit -Werror compiler option
24---
25 configure.ac | 7 ++++++-
26 1 file changed, 6 insertions(+), 1 deletion(-)
27
28diff --git a/configure.ac b/configure.ac
29index 272ea6af9c..798fd5b747 100644
30--- a/configure.ac
31+++ b/configure.ac
32@@ -165,7 +165,12 @@ AS_IF([test "x$enable_Bsymbolic" = "xcheck"],
33 AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbolic-functions])
34 AC_SUBST(JSON_BSYMBOLIC_LDFLAGS)
35
36-AX_APPEND_COMPILE_FLAGS([-Wall -Werror -Wcast-qual -Wno-error=deprecated-declarations])
37+AC_ARG_ENABLE([werror],
38+ AS_HELP_STRING([--disable-werror], [avoid treating compiler warnings as fatal errors]))
39+
40+AS_IF([test "x$enable_werror" != "xno"], [AX_APPEND_COMPILE_FLAGS([-Werror])])
41+
42+AX_APPEND_COMPILE_FLAGS([-Wall -Wcast-qual -Wno-error=deprecated-declarations])
43 AX_APPEND_COMPILE_FLAGS([-Wextra -Wwrite-string -Wno-unused-parameter])
44 AX_APPEND_COMPILE_FLAGS([-D_GNU_SOURCE])
45
diff --git a/meta/recipes-devtools/json-c/json-c_0.13.1.bb b/meta/recipes-devtools/json-c/json-c_0.14.bb
index 522879f21f..99fde873b1 100644
--- a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.14.bb
@@ -4,19 +4,14 @@ HOMEPAGE = "https://github.com/json-c/json-c/wiki"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" 5LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
6 6
7SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \ 7SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz"
8 file://add-disable-werror-option-to-configure.patch \ 8SRC_URI[sha256sum] = "b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870"
9 "
10SRC_URI[md5sum] = "04969ad59cc37bddd83741a08b98f350"
11SRC_URI[sha256sum] = "b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873"
12 9
13UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" 10UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
14UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+)-\d+" 11UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+)-\d+"
15 12
16RPROVIDES_${PN} = "libjson" 13RPROVIDES_${PN} = "libjson"
17 14
18inherit autotools 15inherit cmake
19
20EXTRA_OECONF = "--disable-werror"
21 16
22BBCLASSEXTEND = "native nativesdk" 17BBCLASSEXTEND = "native nativesdk"