From 90643b6193a86be80fdedcf3eb03e8c59adca091 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 7 Oct 2019 10:50:41 -0700
Subject: [PATCH] librsocket-cpp: Update to 2019-10-07

Added patch to remove boost-thread dependency.

Added size optimizations.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 8ceee72c77f22b8cdfe3a372ebbe86094addb70f)
---
 libs/librsocket-cpp/Makefile                  | 20 ++++++++++++++++---
 libs/librsocket-cpp/patches/103-boost.patch   | 12 -----------
 .../patches/103-no-boost-thread.patch         | 11 ++++++++++
 3 files changed, 28 insertions(+), 15 deletions(-)
 delete mode 100644 libs/librsocket-cpp/patches/103-boost.patch
 create mode 100644 libs/librsocket-cpp/patches/103-no-boost-thread.patch

diff --git a/libs/librsocket-cpp/Makefile b/libs/librsocket-cpp/Makefile
index 865addf15..45459978f 100644
--- a/libs/librsocket-cpp/Makefile
+++ b/libs/librsocket-cpp/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=librsocket-cpp
-PKG_SOURCE_DATE:=2019-09-22
-PKG_SOURCE_VERSION:=b268907312af589828634c143b9f35b58cd6cfea
+PKG_SOURCE_DATE:=2019-10-07
+PKG_SOURCE_VERSION:=0a469f7a84d9e3c3ddcb6931df701a5dae536589
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/rsocket/rsocket-cpp/tar.gz/$(PKG_SOURCE_VERSION)?
-PKG_HASH:=7ab4655d3d8148ce689f74a116ae7393d9e802f91d0dfd697ffd8daeff800e61
+PKG_HASH:=c10e498039d676946a11f6a45201575cdb3f1f582752693d7b1901aa434f3146
 PKG_BUILD_DIR:=$(BUILD_DIR)/rsocket-cpp-$(PKG_SOURCE_VERSION)
 
 PKG_MAINTAINER:=Amol Bhave <ambhave@fb.com>
@@ -48,8 +48,22 @@ endef
 CMAKE_OPTIONS += \
 	-DBUILD_BENCHMARKS=OFF \
 	-DBUILD_EXAMPLES=OFF \
+	-DBUILD_SHARED_LIBS=ON \
 	-DBUILD_TESTS=OFF \
 	-DCMAKE_POSITION_INDEPENDENT_CODE=ON
 
+TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -flto
+TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
+
+define Package/librsocket-cpp/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libReactiveSocket.so* $(1)/usr/lib/
+endef
+
+define Package/libyarpl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libyarpl*.so* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,librsocket-cpp))
 $(eval $(call BuildPackage,libyarpl))
diff --git a/libs/librsocket-cpp/patches/103-boost.patch b/libs/librsocket-cpp/patches/103-boost.patch
deleted file mode 100644
index 40737f0ad..000000000
--- a/libs/librsocket-cpp/patches/103-boost.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -194,6 +194,9 @@ find_package(Gflags REQUIRED)
- # find glog::glog to satisfy the folly dep.
- find_package(Glog REQUIRED)
- 
-+find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context
-+                                       date_time program_options)
-+
- include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
- 
- include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR})
diff --git a/libs/librsocket-cpp/patches/103-no-boost-thread.patch b/libs/librsocket-cpp/patches/103-no-boost-thread.patch
new file mode 100644
index 000000000..60a3f34e9
--- /dev/null
+++ b/libs/librsocket-cpp/patches/103-no-boost-thread.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,7 +195,7 @@ find_package(Gflags REQUIRED)
+ find_package(Glog REQUIRED)
+ 
+ # find boost::* to satisfy the folly dep
+-find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context
++find_package(Boost REQUIRED COMPONENTS system filesystem regex context
+                                        program_options)
+ 
+ include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})