Merge pull request #5901 from sartura/openzwave_gcc_and_install_fix
openzwave: fix gcc7 compile and remove bad patch
This commit is contained in:
commit
3bee7544d9
2 changed files with 2 additions and 18 deletions
|
@ -53,6 +53,8 @@ $(call Package/openzwave/default)
|
||||||
TITLE:=Open-ZWave Device Configs
|
TITLE:=Open-ZWave Device Configs
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
TARGET_CPPFLAGS+=-Wno-format -Wno-format-security
|
||||||
|
|
||||||
MAKE_FLAGS += \
|
MAKE_FLAGS += \
|
||||||
LD="$(TARGET_CROSS)g++" \
|
LD="$(TARGET_CROSS)g++" \
|
||||||
LIBDIR="$(PKG_BUILD_DIR)" \
|
LIBDIR="$(PKG_BUILD_DIR)" \
|
||||||
|
|
|
@ -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
|
|
Loading…
Reference in a new issue