From 6ba8c9131bf6356e78c3e0853e8fe343671947d7 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:03:57 -0700 Subject: [PATCH] fbthrift: remove Signed-off-by: Rosen Penev --- libs/fbthrift/Makefile | 62 ------------------- .../patches/010-no-boost-thread.patch | 10 --- libs/fbthrift/patches/020-compiler.patch | 11 ---- 3 files changed, 83 deletions(-) delete mode 100644 libs/fbthrift/Makefile delete mode 100644 libs/fbthrift/patches/010-no-boost-thread.patch delete mode 100644 libs/fbthrift/patches/020-compiler.patch diff --git a/libs/fbthrift/Makefile b/libs/fbthrift/Makefile deleted file mode 100644 index 3ea2999f3..000000000 --- a/libs/fbthrift/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=fbthrift -PKG_VERSION:=2019.10.07.00 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/facebook/fbthrift/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=91403f96a8dc49bc25791fe2836587e644d3e96c55b08e7dfe8bb0075c45a472 - -PKG_MAINTAINER:=Amol Bhave -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE - -HOST_BUILD_DEPENDS:=boost/host -PKG_BUILD_DEPENDS:=fbthrift/host - -HOST_BUILD_PARALLEL:=1 -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/fbthrift - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Facebook's branch of Apache Thrift, including a new C++ server. - URL:=https://github.com/facebook/fbthrift - DEPENDS:=+libfmt +libwangle +librsocket-cpp -endef - -define Package/fbthrift/description - Facebook's branch of Apache Thrift, including a new C++ server. -endef - -CMAKE_HOST_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ - -Dcompiler_only=ON - -CMAKE_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCXX_STD=c++14 \ - -Dlib_only=ON \ - -DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOSTPKG)/include/" \ - -Dpython-six_DIR=OFF - -TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed - -define Package/fbthrift/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,fbthrift)) -$(eval $(call HostBuild)) diff --git a/libs/fbthrift/patches/010-no-boost-thread.patch b/libs/fbthrift/patches/010-no-boost-thread.patch deleted file mode 100644 index cf7a4dd09..000000000 --- a/libs/fbthrift/patches/010-no-boost-thread.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,6 @@ find_package( - program_options - regex - system -- thread - ) - include_directories(${Boost_INCLUDE_DIRS}) - diff --git a/libs/fbthrift/patches/020-compiler.patch b/libs/fbthrift/patches/020-compiler.patch deleted file mode 100644 index b1182dddb..000000000 --- a/libs/fbthrift/patches/020-compiler.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/thrift/cmake/FBThriftConfig.cmake.in -+++ b/thrift/cmake/FBThriftConfig.cmake.in -@@ -20,7 +20,7 @@ set_and_check(FBTHRIFT_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") - if (WIN32) - set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1.exe") - else() -- set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") -+# set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") - endif() - - if (NOT TARGET FBThrift::thriftcpp2)