diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-31 17:52:41 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-03 15:25:54 +0100 |
| commit | caf64f85b5c57d886f3c4e5f295b12d93dd6c384 (patch) | |
| tree | f1867e3ddabf267c9c13d1c687bca5226b7c2258 /meta/recipes-devtools/json-c | |
| parent | d1842007c56cfcac67e8c7fb91638a411b8f27f5 (diff) | |
| download | openembedded-core-contrib-caf64f85b5c57d886f3c4e5f295b12d93dd6c384.tar.gz | |
json-c: update 0.13.1 - > 0.14
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/json-c')
| -rw-r--r-- | meta/recipes-devtools/json-c/json-c/add-disable-werror-option-to-configure.patch | 45 | ||||
| -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 @@ -json-c: Backport --disable-werror patch to allow compilation under icecc - -icecc preprocesses source files locally before shipping them off to be compiled -on remote hosts. This preprocessing removes comments, including /* fallthough */ -comments in switch statements that normally prevent an implicit-fallthrough -warning, see https://github.com/icecc/icecream/issues/419 - -Rather than turning off -Werror, the upstream project has implemented a -configure option, --disable-werror, in response to Ross's -https://github.com/json-c/json-c/issues/489 - -This patch from -https://github.com/json-c/json-c/commit/21c886534f8927fdc0fb5f8647394f3e0e0874b8 - -Upstream-Status: Backport [Not yet released] -Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> - -From 21c886534f8927fdc0fb5f8647394f3e0e0874b8 Mon Sep 17 00:00:00 2001 -From: Pierce Lopez <pierce.lopez@gmail.com> -Date: Sun, 9 Jun 2019 10:52:08 -0400 -Subject: [PATCH] build: add --disable-werror option to configure - -to omit -Werror compiler option ---- - configure.ac | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 272ea6af9c..798fd5b747 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -165,7 +165,12 @@ AS_IF([test "x$enable_Bsymbolic" = "xcheck"], - AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbolic-functions]) - AC_SUBST(JSON_BSYMBOLIC_LDFLAGS) - --AX_APPEND_COMPILE_FLAGS([-Wall -Werror -Wcast-qual -Wno-error=deprecated-declarations]) -+AC_ARG_ENABLE([werror], -+ AS_HELP_STRING([--disable-werror], [avoid treating compiler warnings as fatal errors])) -+ -+AS_IF([test "x$enable_werror" != "xno"], [AX_APPEND_COMPILE_FLAGS([-Werror])]) -+ -+AX_APPEND_COMPILE_FLAGS([-Wall -Wcast-qual -Wno-error=deprecated-declarations]) - AX_APPEND_COMPILE_FLAGS([-Wextra -Wwrite-string -Wno-unused-parameter]) - AX_APPEND_COMPILE_FLAGS([-D_GNU_SOURCE]) - 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" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" -SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \ - file://add-disable-werror-option-to-configure.patch \ - " -SRC_URI[md5sum] = "04969ad59cc37bddd83741a08b98f350" -SRC_URI[sha256sum] = "b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873" +SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz" +SRC_URI[sha256sum] = "b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+)-\d+" RPROVIDES_${PN} = "libjson" -inherit autotools - -EXTRA_OECONF = "--disable-werror" +inherit cmake BBCLASSEXTEND = "native nativesdk" |