Browse Source

Merge pull request #5901 from sartura/openzwave_gcc_and_install_fix

openzwave: fix gcc7 compile and remove bad patch
lilik-openwrt-22.03
Marko Ratkaj 7 years ago
committed by GitHub
parent
commit
3bee7544d9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 18 deletions
  1. +2
    -0
      utils/openzwave/Makefile
  2. +0
    -18
      utils/openzwave/patches/903-no-examples.patch

+ 2
- 0
utils/openzwave/Makefile View 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)" \


+ 0
- 18
utils/openzwave/patches/903-no-examples.patch View File

@ -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…
Cancel
Save