diff options
| -rw-r--r-- | libs/fbthrift/Makefile | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libs/fbthrift/Makefile b/libs/fbthrift/Makefile index 7abdd4c97..823436fd8 100644 --- a/libs/fbthrift/Makefile +++ b/libs/fbthrift/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fbthrift 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/fbthrift/tar.gz/v$(PKG_VERSION)? @@ -12,10 +12,9 @@ PKG_MAINTAINER:=Amol Bhave <ambhave@fb.com> PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -HOST_BUILD_DEPENDS:=boost/host libmstch/host +HOST_BUILD_DEPENDS:=libmstch/host PKG_BUILD_DEPENDS:=fbthrift/host -HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST) HOST_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1 CMAKE_INSTALL:=1 @@ -28,9 +27,7 @@ define Package/fbthrift SECTION:=libs CATEGORY:=Libraries TITLE:=Facebook's branch of Apache Thrift, including a new C++ server. - DEPENDS:=+libwangle +libfmt +libmstch +librsocket-cpp \ - +@boost-host-build-chrono +@boost-host-build-date_time +@boost-host-build-atomic \ - +@boost-host-build-thread +@boost-host-build-system +@boost-host-build-filesystem + DEPENDS:=+libwangle +libfmt +librsocket-cpp endef define Package/fbthrift/description @@ -39,17 +36,17 @@ endef CMAKE_HOST_OPTIONS += \ -DBoost_NO_BOOST_CMAKE=ON \ - -Dcompiler_only=ON \ -DCMAKE_SKIP_RPATH=FALSE \ - -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \ + -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" \ + -Dcompiler_only=ON CMAKE_OPTIONS += \ -DBoost_NO_BOOST_CMAKE=ON \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -Dlib_only=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/fbthrift/install $(INSTALL_DIR) $(1)/usr/lib |