librsocket-cpp: Update to 2019-09-12

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/librsocket-cpp/Makefile b/libs/librsocket-cpp/Makefile
index e34b93a18d4cf30f28fa4aea230e0d22dc98fc6b..ae0dba8e002fe28ba77d014f1c21ab9493431767 100644 (file)
--- 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-06-11
-PKG_SOURCE_VERSION:=741f817fd519e0610cddb5783aae812355e19435
+PKG_SOURCE_DATE:=2019-09-12
+PKG_SOURCE_VERSION:=9226988e3da89eff8cd55952ccae61fcac0881fa
 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:=56886deba0f3594b4a430b1f515c90a138800b8e387440e6b8bf728d660f457a
+PKG_HASH:=3273012c1ffa149fddfac2b547315834e9a02ff0d8d1357196fec95391150ed6
 PKG_BUILD_DIR:=$(BUILD_DIR)/rsocket-cpp-$(PKG_SOURCE_VERSION)
 
 PKG_MAINTAINER:=Amol Bhave <ambhave@fb.com>
@@ -22,42 +22,31 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/librsocket-cpp
-       SECTION:=libs
-       CATEGORY:=Libraries
-       TITLE:=C++ implementation of RSocket
-       DEPENDS:=+libyarpl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=C++ implementation of RSocket
+  DEPENDS:=+libyarpl
 endef
 
 define Package/libyarpl
-       SECTION:=libs
-       CATEGORY:=Libraries
-       TITLE:=yarpl: Yet Another Reactive Programming Library
-       DEPENDS:=+libfolly
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=yarpl: Yet Another Reactive Programming Library
+  DEPENDS:=+libfolly
 endef
 
 define Package/librsocket-cpp/description
-       C++ implementation of RSocket, and Application protocol providing Reactive Streams semantics
+  C++ implementation of RSocket, and Application protocol providing Reactive Streams semantics
 endef
 
 define Package/libyarpl/description
-       C++ implementation of reactive functional programming including both Observable and Flowable types.
+  C++ implementation of reactive functional programming including both Observable and Flowable types.
 endef
 
 CMAKE_OPTIONS += \
        -DBUILD_BENCHMARKS=OFF \
        -DBUILD_EXAMPLES=OFF \
-       -DBUILD_TESTS=OFF \
-       -DBUILD_SHARED_LIBS=ON
-
-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
+       -DBUILD_TESTS=OFF
 
 $(eval $(call BuildPackage,librsocket-cpp))
 $(eval $(call BuildPackage,libyarpl))

diff --git a/libs/librsocket-cpp/patches/101-do-not-use-gold.patch b/libs/librsocket-cpp/patches/101-do-not-use-gold.patch
index c9f33876fc77dcf493f9394348f37169f2f5b8c1..a65154e58693c72e567a0504c974b5113aee9d55 100644 (file)
--- a/libs/librsocket-cpp/patches/101-do-not-use-gold.patch
+++ b/libs/librsocket-cpp/patches/101-do-not-use-gold.patch
@@ -1,4 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -67,7 +67,6 @@