diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2017-06-02 07:55:23 +0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-06-02 08:41:32 +0200 |
| commit | 7d8dd2a5d23cfc6d3e71081a09634595837313c2 (patch) | |
| tree | b803216066d58003cf9319131d0559d1db4250ac | |
| parent | 3294a594cfcd121832e1b7c0e71067607a453e63 (diff) | |
| download | buildroot-7d8dd2a5d23cfc6d3e71081a09634595837313c2.tar.gz buildroot-7d8dd2a5d23cfc6d3e71081a09634595837313c2.zip | |
swupdate: fix build without json-c
swupdate enables SURICATTA_HAWKBIT by default, which unconditionally selects
JSON. This breaks the build when the optional json-c dependency is not built.
Add a patch fixing SURICATTA_HAWKBIT dependencies.
Fixes:
http://autobuild.buildroot.net/results/e61/e6179f515589a42a9aee16b54b897ef9111e7f4b/
http://autobuild.buildroot.net/results/dba/dba54b00c81f62d957a8c189dde39ba0db8864e6/
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/swupdate/0001-suricata_hawkbit-depends-on-HAVE_JSON_C.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/package/swupdate/0001-suricata_hawkbit-depends-on-HAVE_JSON_C.patch b/package/swupdate/0001-suricata_hawkbit-depends-on-HAVE_JSON_C.patch new file mode 100644 index 0000000000..e8cd790bd4 --- /dev/null +++ b/package/swupdate/0001-suricata_hawkbit-depends-on-HAVE_JSON_C.patch @@ -0,0 +1,39 @@ +From ae647879efad6ba2bb0b95ed7e70dee82c05b82a Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Fri, 2 Jun 2017 07:40:08 +0300 +Subject: [PATCH] suricata_hawkbit: depends on HAVE_JSON_C + +Unconditionally selecting JSON when !HAVE_JSON_C leads to a warning: + +warning: (SURICATTA_HAWKBIT) selects JSON which has unmet direct dependencies (HAVE_JSON_C) + +and eventually a build failure: + +In file included from corelib/artifacts_versions.c:34:0: +include/parselib.h:61:25: fatal error: json-c/json.h: No such file or directory + +Make SURICATTA_HAWKBIT depend on HAVE_JSON_C. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: +https://groups.google.com/forum/?hl=en#!topic/swupdate/WmwNN_Hni0c + + suricatta/Config.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/suricatta/Config.in b/suricatta/Config.in +index 24bd5d1053f5..cfd96b83506a 100644 +--- a/suricatta/Config.in ++++ b/suricatta/Config.in +@@ -54,6 +54,7 @@ choice + config SURICATTA_HAWKBIT + bool "hawkBit support" + depends on HAVE_LIBCURL ++ depends on HAVE_JSON_C + select JSON + select SURICATTA + help +-- +2.11.0 + |
