From: Florian Fainelli <redacted>
Date: Sun, 18 Jun 2017 21:23:40 +0000 (-0700)
Subject: openzwave: Avoid picking host libraries
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6950ee9669ef27e949cc50267b18570ad1e99938;p=openwrt-packages.git

openzwave: Avoid picking host libraries

cpp/examples/MinOZW/Makefile contains this rule:

LIBS =  $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/*.so
$(top_builddir)/*.dylib $(top_builddir)/cpp/build/*.so
$(top_builddir)/cpp/build/*.dylib )
LIBSDIR = $(abspath $(dir $(firstword $(LIBS))))

with LIBDIR not being defined anywhere we end up picking up host
libraries.

Signed-off-by: Florian Fainelli <redacted>
---

diff --git a/utils/openzwave/Makefile b/utils/openzwave/Makefile
index 28125a4ee..1445c1a6d 100644
--- a/utils/openzwave/Makefile
+++ b/utils/openzwave/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openzwave
 PKG_REV:=164
 PKG_VERSION:=1.4.$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://old.openzwave.com/downloads
@@ -55,6 +55,7 @@ endef
 
 MAKE_FLAGS += \
 	LD="$(TARGET_CROSS)g++" \
+	LIBDIR="$(PKG_BUILD_DIR)" \
 	PREFIX=$(CONFIGURE_PREFIX) \
 	instlibdir=/usr/lib \
 	pkgconfigdir=/usr/lib/pkgconfig \