Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fbthrift: Install to STAGING_DIR_HOSTPKG

Browse source 
As part of the boost change. Also get rid of various CMake options as
CMake can find everything properly now.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-06-17 11:34:47 -07:00
parent 2838fbc38d
commit 9af485036f
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/fbthrift/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=fbthrift PKG_NAME:=fbthrift
PKG_VERSION:=2019.06.10.00 PKG_VERSION:=2019.06.10.00
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/facebook/fbthrift/tar.gz/v$(PKG_VERSION)? 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:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
HOST_BUILD_DEPENDS:=boost/host libmstch/host HOST_BUILD_DEPENDS:=libmstch/host
PKG_BUILD_DEPENDS:=fbthrift/host PKG_BUILD_DEPENDS:=fbthrift/host
HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
@ -28,9 +27,7 @@ define Package/fbthrift
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Facebook's branch of Apache Thrift, including a new C++ server. TITLE:=Facebook's branch of Apache Thrift, including a new C++ server.
DEPENDS:=+libwangle +libfmt +libmstch +librsocket-cpp \ DEPENDS:=+libwangle +libfmt +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
endef endef
define Package/fbthrift/description define Package/fbthrift/description
@ -39,17 +36,17 @@ endef
CMAKE_HOST_OPTIONS += \ CMAKE_HOST_OPTIONS += \
-DBoost_NO_BOOST_CMAKE=ON \ -DBoost_NO_BOOST_CMAKE=ON \
-Dcompiler_only=ON \
-DCMAKE_SKIP_RPATH=FALSE \ -DCMAKE_SKIP_RPATH=FALSE \
-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \ -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" \
-Dcompiler_only=ON
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-DBoost_NO_BOOST_CMAKE=ON \ -DBoost_NO_BOOST_CMAKE=ON \
-DBUILD_SHARED_LIBS=ON \ -DBUILD_SHARED_LIBS=ON \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-Dlib_only=ON \ -Dlib_only=ON \
-DTHRIFT1="$(STAGING_DIR_HOST)/bin/thrift1" \ -DTHRIFT1="$(STAGING_DIR_HOSTPKG)/bin/thrift1" \
-DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOST)/include/" -DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOSTPKG)/include/"
define Package/fbthrift/install define Package/fbthrift/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib