* [Buildroot] [PATCH] swupdate: fix build without json-c
@ 2017-06-02 4:55 Baruch Siach
2017-06-02 6:41 ` Peter Korsgaard
0 siblings, 1 reply; 2+ messages in thread
From: Baruch Siach @ 2017-06-02 4:55 UTC (permalink / raw)
To: buildroot
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>
---
...1-suricata_hawkbit-depends-on-HAVE_JSON_C.patch | 39 ++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 package/swupdate/0001-suricata_hawkbit-depends-on-HAVE_JSON_C.patch
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 000000000000..e8cd790bd457
--- /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
+
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] swupdate: fix build without json-c
2017-06-02 4:55 [Buildroot] [PATCH] swupdate: fix build without json-c Baruch Siach
@ 2017-06-02 6:41 ` Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2017-06-02 6:41 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> 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>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-02 6:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-02 4:55 [Buildroot] [PATCH] swupdate: fix build without json-c Baruch Siach
2017-06-02 6:41 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.