openzwave: fix gcc7 compile and remove bad patch 5901/head
authorMarko Ratkaj <marko.ratkaj@sartura.hr>
Wed, 11 Apr 2018 09:04:42 +0000 (11:04 +0200)
committerMarko Ratkaj <marko.ratkaj@sartura.hr>
Wed, 11 Apr 2018 12:30:49 +0000 (14:30 +0200)
Patch 903-no-examples.patch removes MinOZW binary. This is wrong since
install section of openzwave is still using it. We can either remove the
patch or remove install section for openzwave. It seems people are using
this binary so we remove the patch.

After removing the patch the following issue appears with gcc7:
cc1plus: error: -Wformat-security ignored without -Wformat

This is resolved by adding the following to Makefile
TARGET_CPPFLAGS+=-Wno-format -Wno-format-security

Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
utils/openzwave/Makefile
utils/openzwave/patches/903-no-examples.patch [deleted file]

index 1445c1a6dd353785c61b23c0fbbab0e73aab2d0a..da63dfb7259cbaf6d4df167c5e3136af82a5ab7f 100644 (file)
@@ -53,6 +53,8 @@ $(call Package/openzwave/default)
   TITLE:=Open-ZWave Device Configs
 endef
 
+TARGET_CPPFLAGS+=-Wno-format -Wno-format-security
+
 MAKE_FLAGS += \
        LD="$(TARGET_CROSS)g++" \
        LIBDIR="$(PKG_BUILD_DIR)" \
diff --git a/utils/openzwave/patches/903-no-examples.patch b/utils/openzwave/patches/903-no-examples.patch
deleted file mode 100644 (file)
index 52ea137..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -18,15 +18,12 @@
- all: 
-       CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) 
--      CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) 
- install:
-       $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
--      $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
- clean:
-       $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
--      $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
- cpp/src/vers.cpp:
-       CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) cpp/src/vers.cpp