From caf1a153d379dffb023d2b6bb0a314cf028a8c15 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 7 Oct 2019 10:41:19 -0700 Subject: [PATCH] libwangle: Update to 2019.10.07.00 Added patch to remove boost-thread dependency. Signed-off-by: Rosen Penev --- libs/libwangle/Makefile | 21 ++++++++++++------- .../patches/020-no-boost-thread.patch | 11 ++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 libs/libwangle/patches/020-no-boost-thread.patch diff --git a/libs/libwangle/Makefile b/libs/libwangle/Makefile index 64fd1b497..06338dc5a 100644 --- a/libs/libwangle/Makefile +++ b/libs/libwangle/Makefile @@ -1,21 +1,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwangle -PKG_VERSION:=2019.09.22.00 +PKG_VERSION:=2019.10.07.00 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_VERSION:=fb79e25af6d4e184587b62475fb3444643ae8867 -PKG_SOURCE_URL:=https://codeload.github.com/facebook/wangle/tar.gz/$(PKG_SOURCE_VERSION)? -PKG_HASH:=e973cad492d025c93af49c245b1f77b484df09a4d70ade069648d633d5a85e0e -PKG_BUILD_DIR:=$(BUILD_DIR)/wangle-$(PKG_SOURCE_VERSION) +PKG_SOURCE_URL:=https://codeload.github.com/facebook/wangle/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=b030fbff5f346ba4e50e97fc452b321f1f32b215ba7a31e1538c2996b76cf1e9 +PKG_BUILD_DIR:=$(BUILD_DIR)/wangle-$(PKG_VERSION) PKG_MAINTAINER:=Amol Bhave PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=libfizz CMAKE_SOURCE_SUBDIR:=wangle CMAKE_INSTALL:=1 @@ -27,9 +25,18 @@ define Package/libwangle CATEGORY:=Libraries TITLE:=Wangle: C++ networking library URL:=https://github.com/facebook/wangle + DEPENDS:=+libfizz endef -TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -flto +TARGET_CXXFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed +CMAKE_OPTIONS += \ + -DBUILD_SHARED_LIBS=ON + +define Package/libwangle/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwangle.so* $(1)/usr/lib/ +endef + $(eval $(call BuildPackage,libwangle)) diff --git a/libs/libwangle/patches/020-no-boost-thread.patch b/libs/libwangle/patches/020-no-boost-thread.patch new file mode 100644 index 000000000..375e57a73 --- /dev/null +++ b/libs/libwangle/patches/020-no-boost-thread.patch @@ -0,0 +1,11 @@ +--- a/wangle/CMakeLists.txt ++++ b/wangle/CMakeLists.txt +@@ -56,7 +56,7 @@ if (NOT folly_FOUND) + endif() + + find_package(fizz CONFIG REQUIRED) +-find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context ++find_package(Boost REQUIRED COMPONENTS system filesystem regex context + program_options) + find_package(OpenSSL REQUIRED) + find_package(Glog REQUIRED)