diff options
| author | Marko Ratkaj <marko.ratkaj@sartura.hr> | 2018-03-23 13:50:28 +0100 |
|---|---|---|
| committer | Marko Ratkaj <marko.ratkaj@sartura.hr> | 2018-03-23 18:26:06 +0100 |
| commit | 83a29f5c5ab8aab1f60155d2843af9559c7c19ee (patch) | |
| tree | e7007e68f9750f8f85c95a07a9ac2e9148a24f0a /utils/openzwave | |
| parent | 759ee14f415362ff4ef19a5c12a61a490ec07ff7 (diff) | |
utils: openzwave: disable examples and fix include
Patch 903 disables building of examples.
Patch 904 fixes the following issue:
When building software that build depends on openzwave, build will
always search in /usr/include/openzwave instead of
staging_dir/.../usr/include/openzwave.
Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
Diffstat (limited to 'utils/openzwave')
| -rw-r--r-- | utils/openzwave/patches/903-no-examples.patch | 18 | ||||
| -rw-r--r-- | utils/openzwave/patches/904-fix-lib-include-path.patch | 15 |
2 files changed, 33 insertions, 0 deletions
diff --git a/utils/openzwave/patches/903-no-examples.patch b/utils/openzwave/patches/903-no-examples.patch new file mode 100644 index 000000000..52ea13713 --- /dev/null +++ b/utils/openzwave/patches/903-no-examples.patch @@ -0,0 +1,18 @@ +--- 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 diff --git a/utils/openzwave/patches/904-fix-lib-include-path.patch b/utils/openzwave/patches/904-fix-lib-include-path.patch new file mode 100644 index 000000000..d0c7c39e2 --- /dev/null +++ b/utils/openzwave/patches/904-fix-lib-include-path.patch @@ -0,0 +1,15 @@ +diff --git a/cpp/build/Makefile b/cpp/build/Makefile +index 666472d..41dc58c 100644 +--- a/cpp/build/Makefile ++++ b/cpp/build/Makefile +@@ -139,8 +139,8 @@ $(top_builddir)/libopenzwave.pc: $(top_srcdir)/cpp/build/libopenzwave.pc.in $(PK + @$(SED) \ + -e 's|[@]prefix@|$(PREFIX)|g' \ + -e 's|[@]exec_prefix@|$(PREFIX)/bin|g' \ +- -e 's|[@]libdir@|$(instlibdir)|g' \ +- -e 's|[@]includedir@|$(PREFIX)/include/openzwave/|g' \ ++ -e 's|[@]libdir@|$${prefix}/lib|g' \ ++ -e 's|[@]includedir@|$${prefix}/include/openzwave/|g' \ + -e 's|[@]sysconfdir@|/etc/openzwave/|g' \ + -e 's|[@]gitversion@|$(GITVERSION)|g' \ + -e 's|[@]docdir@|$(docdir)/|g' \ |