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

fbthrift: Update to 2019-09-22

Browse source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-08-11 21:46:29 -07:00
parent 164e706f9d
commit 7139cddccf
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 43 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
libs/fbthrift/Makefile
View file

@ -1,19 +1,22 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fbthrift PKG_NAME:=fbthrift
PKG_VERSION:=2019.06.10.00 PKG_SOURCE_DATE:=2019-09-22
PKG_RELEASE:=2 PKG_SOURCE_VERSION:=2f9839604e2569120cc4876c667388da6d7342f2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).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/$(PKG_SOURCE_VERSION)?
PKG_HASH:=0897c66564a2742b24dd6ae77812b42987c3493944d1d5d40d4005d71deb7cb5 PKG_HASH:=339a73610ad19070d33151127966aaf56e5df3640c238292fc74658c3075da3a
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
PKG_MAINTAINER:=Amol Bhave <ambhave@fb.com> 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:=libmstch/host HOST_BUILD_DEPENDS:=libmstch/host
PKG_BUILD_DEPENDS:=fbthrift/host PKG_BUILD_DEPENDS:=fbthrift/host libwangle librsocket-cpp
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
@ -24,34 +27,40 @@ include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
define Package/fbthrift 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 +librsocket-cpp URL:=https://github.com/facebook/fbthrift
DEPENDS:=+libfmt +libfolly
endef endef
define Package/fbthrift/description define Package/fbthrift/description
Facebook's branch of Apache Thrift, including a new C++ server. Facebook's branch of Apache Thrift, including a new C++ server.
endef endef
CMAKE_HOST_OPTIONS += \ CMAKE_HOST_OPTIONS += \
-DBoost_NO_BOOST_CMAKE=ON \ -DBUILD_SHARED_LIBS=ON \
-DCMAKE_SKIP_RPATH=FALSE \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" \ -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" \
-Dcompiler_only=ON -Dcompiler_only=ON
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-DBoost_NO_BOOST_CMAKE=ON \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DCXX_STD=c++14 \
-Dlib_only=ON \ -Dlib_only=ON \
-DTHRIFT1="$(STAGING_DIR_HOSTPKG)/bin/thrift1" \ -DTHRIFT1="$(STAGING_DIR_HOSTPKG)/bin/thrift1" \
-DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOSTPKG)/include/" -DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOSTPKG)/include/" \
-Dpython-six_DIR=OFF
define Package/fbthrift/install # This should not be necessary as it is supposed to be done above.
$(INSTALL_DIR) $(1)/usr/lib # Someone broke something.
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/ HOST_LDFLAGS += -Wl,-rpath="$(STAGING_DIR_HOSTPKG)/lib"
endef
# GCC9 bug
TARGET_LDFLAGS += -fno-lto
TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
$(eval $(call BuildPackage,fbthrift)) $(eval $(call BuildPackage,fbthrift))
$(eval $(call HostBuild)) $(eval $(call HostBuild))

14
libs/fbthrift/patches/010-boost.patch Normal file
View file

@ -0,0 +1,14 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,11 @@ endif(MSVC)
find_package(
Boost 1.54.0 REQUIRED #1.54.0 or greater
COMPONENTS
+ context
+ date_time
filesystem
+ program_options
+ regex
system
thread
)