fbzmq: Switch to HOSTPKG

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/fbzmq/Makefile b/libs/fbzmq/Makefile
index d74ef4f6bf3623041ab144125d816aec76a5b595..f25ed7c76c00401e8a373f8861cc45c8c94a80ca 100644 (file)
--- a/libs/fbzmq/Makefile
+++ b/libs/fbzmq/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fbzmq
 PKG_VERSION:=2019.06.10.00
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/facebook/fbzmq/tar.gz/v$(PKG_VERSION)?
@@ -12,6 +12,7 @@ PKG_MAINTAINER:=Amol Bhave <ambhave@fb.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
+CMAKE_SOURCE_SUBDIR:=fbzmq
 PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
@@ -29,13 +30,12 @@ define Package/fbzmq/description
        Facebook ZeroMQ wrappers.
 endef
 
-CMAKE_SOURCE_SUBDIR:=fbzmq
-CMAKE_OPTIONS:= \
+CMAKE_OPTIONS += \
        -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
        -DBUILD_TESTS=OFF \
        -DBUILD_SHARED_LIBS=ON \
-       -DTHRIFT1="$(STAGING_DIR_HOST)/bin/thrift1" \
-       -DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOST)/include/"
+       -DTHRIFT1="$(STAGING_DIR_HOSTPKG)/bin/thrift1" \
+       -DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOSTPKG)/include/"
 
 define Package/fbzmq/install
        $(INSTALL_DIR) $(1)/usr/lib