From 197837f0e28e85dffb620d74e402f3a44b37bba7 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 11 Jun 2019 13:29:23 -0700 Subject: [PATCH] librsocket-cpp: Update to 2019-06-11 Fix compilation with newer GCC Added Maintainer. Reorganized Makefile for consistency. Signed-off-by: Rosen Penev --- libs/librsocket-cpp/Makefile | 26 ++++++++++--------- ...0-fix-momit-leaf-frame-pointer-error.patch | 16 ------------ libs/librsocket-cpp/patches/102-gcc9.patch | 11 ++++++++ 3 files changed, 25 insertions(+), 28 deletions(-) delete mode 100644 libs/librsocket-cpp/patches/100-fix-momit-leaf-frame-pointer-error.patch create mode 100644 libs/librsocket-cpp/patches/102-gcc9.patch diff --git a/libs/librsocket-cpp/Makefile b/libs/librsocket-cpp/Makefile index 775ca72fc8..e34b93a18d 100644 --- a/libs/librsocket-cpp/Makefile +++ b/libs/librsocket-cpp/Makefile @@ -1,30 +1,26 @@ include $(TOPDIR)/rules.mk PKG_NAME:=librsocket-cpp -PKG_SOURCE_DATE:=2019-05-08 -PKG_SOURCE_VERSION:=ddc80392b17a3fadcbea09f82ea5f6936f0fd459 +PKG_SOURCE_DATE:=2019-06-11 +PKG_SOURCE_VERSION:=741f817fd519e0610cddb5783aae812355e19435 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/rsocket/rsocket-cpp/tar.gz/$(PKG_SOURCE_VERSION)? -PKG_HASH:=b9b5177be57f6cd23ff3592845b11209167f679b683cb73acbf351e7a3550a76 +PKG_HASH:=56886deba0f3594b4a430b1f515c90a138800b8e387440e6b8bf728d660f457a PKG_BUILD_DIR:=$(BUILD_DIR)/rsocket-cpp-$(PKG_SOURCE_VERSION) +PKG_MAINTAINER:=Amol Bhave PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - PKG_BUILD_PARALLEL:=1 CMAKE_BINARY_SUBDIR:=builddir -CMAKE_OPTIONS:= \ - -DBUILD_BENCHMARKS=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_TESTS=OFF \ - -DBUILD_SHARED_LIBS=ON CMAKE_INSTALL:=1 +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + define Package/librsocket-cpp SECTION:=libs CATEGORY:=Libraries @@ -47,6 +43,12 @@ define Package/libyarpl/description 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/ diff --git a/libs/librsocket-cpp/patches/100-fix-momit-leaf-frame-pointer-error.patch b/libs/librsocket-cpp/patches/100-fix-momit-leaf-frame-pointer-error.patch deleted file mode 100644 index 24dfe4b2a1..0000000000 --- a/libs/librsocket-cpp/patches/100-fix-momit-leaf-frame-pointer-error.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/yarpl/CMakeLists.txt b/yarpl/CMakeLists.txt ---- a/yarpl/CMakeLists.txt Fri May 03 07:45:18 2019 -0700 -+++ b/yarpl/CMakeLists.txt Tue May 07 02:03:23 2019 -0700 -@@ -21,7 +21,11 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-weak-vtables -Wno-padded") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -momit-leaf-frame-pointer") -+ include(CheckCXXCompilerFlag) -+ CHECK_CXX_COMPILER_FLAG("-momit-leaf-frame-pointer" HAVE_OMIT_LEAF_FRAME_POINTER) -+ if(HAVE_OMIT_LEAF_FRAME_POINTER) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -momit-leaf-frame-pointer") -+ endif() - endif() - - if(YARPL_WRAP_SHARED_IN_LOCK) diff --git a/libs/librsocket-cpp/patches/102-gcc9.patch b/libs/librsocket-cpp/patches/102-gcc9.patch new file mode 100644 index 0000000000..1a5910a4bd --- /dev/null +++ b/libs/librsocket-cpp/patches/102-gcc9.patch @@ -0,0 +1,11 @@ +--- a/yarpl/Refcounted.h ++++ b/yarpl/Refcounted.h +@@ -42,7 +42,7 @@ std::shared_ptr atomic_exchange( + auto refptr = ar->ref.lock(); + auto old = std::move(*refptr); + *refptr = std::move(r); +- return std::move(old); ++ return old; + } + + template -- 2.30.2