projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f32fa20)
libcpprestsdk: new package
authorAdam Duskett <aduskett@codeblue.com>
Sun, 14 Jan 2018 19:56:44 +0000 (14:56 -0500)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mon, 15 Jan 2018 22:18:00 +0000 (23:18 +0100)
The C++ REST SDK is a Microsoft project for cloud-based client-server
communication in native code using a modern asynchronous C++ API design.
This project aims to help C++ developers connect to and interact with
services.

This package is licensed under the MIT package and depends on BOOST
and OpenSSL/LibreSSL.

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
DEVELOPERS patch | blob | history
package/Config.in patch | blob | history
package/libcpprestsdk/0001-fix-xlocale-header-check.patch [new file with mode: 0644] patch | blob
package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch [new file with mode: 0644] patch | blob
package/libcpprestsdk/0003-fix-strand.patch [new file with mode: 0644] patch | blob
package/libcpprestsdk/Config.in [new file with mode: 0644] patch | blob
package/libcpprestsdk/libcpprestsdk.hash [new file with mode: 0644] patch | blob
package/libcpprestsdk/libcpprestsdk.mk [new file with mode: 0644] patch | blob

diff --git a/DEVELOPERS b/DEVELOPERS
index 5589e85c4fa14bc6b038292a3cd249519cadd925..0e754456cb5c01bff221f215769ce98d3934049e 100644 (file)
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -44,6 +44,7 @@ F:    package/gstreamer1/gst1-vaapi/
 F:     package/imx-usb-loader/
 F:     package/janus-gateway/
 F:     package/json-for-modern-cpp/
+F:     package/libcpprestsdk/
 F:     package/libressl/
 F:     package/libselinux/
 F:     package/libsemanage/
diff --git a/package/Config.in b/package/Config.in
index c3a2e38b8e01cff605ef25cec605fa19110065f3..8e8e7581ce0e7c5623e3f6e8aeca3144eeea42ad 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -1361,6 +1361,7 @@ menu "Networking"
        source "package/libcgi/Config.in"
        source "package/libcgicc/Config.in"
        source "package/libcoap/Config.in"
+       source "package/libcpprestsdk/Config.in"
        source "package/libcurl/Config.in"
        source "package/libdnet/Config.in"
        source "package/libeXosip2/Config.in"
diff --git a/package/libcpprestsdk/0001-fix-xlocale-header-check.patch b/package/libcpprestsdk/0001-fix-xlocale-header-check.patch
new file mode 100644 (file)
index 0000000..ffed94a
--- /dev/null
+++ b/package/libcpprestsdk/0001-fix-xlocale-header-check.patch
@@ -0,0 +1,55 @@
+From a826b7b656c165bc35746d9af3ec371387d2bca1 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Mon, 23 Oct 2017 08:11:21 -0400
+Subject: [PATCH] fix xlocale header check
+
+asyncrt_utils.h checks if __GLIBC__ is not defined before including
+xlocal.h.  This will cause a compilation failure on uclibc and musl.
+
+Add a proper check in CMakeLists.txt and check for HAVE_XLOCALE_H
+instead of __GLIBC__
+
+Upstream-Status: Accepted
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ Release/CMakeLists.txt                  | 3 +++
+ Release/include/cpprest/asyncrt_utils.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
+index d57aa3d..eefae75 100644
+--- a/Release/CMakeLists.txt
++++ b/Release/CMakeLists.txt
+@@ -42,6 +42,7 @@ include(cmake/cpprest_find_boost.cmake)
+ include(cmake/cpprest_find_zlib.cmake)
+ include(cmake/cpprest_find_openssl.cmake)
+ include(cmake/cpprest_find_websocketpp.cmake)
++include(CheckIncludeFiles)
+ 
+ find_package(Threads REQUIRED)
+ if(THREADS_HAVE_PTHREAD_ARG)
+@@ -56,6 +57,8 @@ if(CPPREST_EXCLUDE_WEBSOCKETS)
+   set(CPPREST_WEBSOCKETS_IMPL none CACHE STRING "Internal use.")
+ endif()
+ 
++CHECK_INCLUDE_FILES(xlocale.h HAVE_XLOCALE_H)
++
+ if(APPLE) # Note: also iOS
+   set(CPPREST_PPLX_IMPL apple CACHE STRING "Internal use.")
+   set(CPPREST_WEBSOCKETS_IMPL wspp CACHE STRING "Internal use.")
+diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h
+index fac70a9..8faa2dc 100644
+--- a/Release/include/cpprest/asyncrt_utils.h
++++ b/Release/include/cpprest/asyncrt_utils.h
+@@ -29,7 +29,7 @@
+ 
+ #ifndef _WIN32
+ #include <boost/algorithm/string.hpp>
+-#if !defined(ANDROID) && !defined(__ANDROID__) && !defined(__GLIBC__) // CodePlex 269
++#if !defined(ANDROID) && !defined(__ANDROID__) && defined(HAVE_XLOCALE_H) // CodePlex 269
+ /* Systems using glibc: xlocale.h has been removed from glibc 2.26
+    The above include of locale.h is sufficient
+    Further details: https://sourceware.org/git/?p=glibc.git;a=commit;h=f0be25b6336db7492e47d2e8e72eb8af53b5506d */
+-- 
+2.13.6
+
diff --git a/package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch b/package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch
new file mode 100644 (file)
index 0000000..12f049b
--- /dev/null
+++ b/package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch
@@ -0,0 +1,28 @@
+From 25453f9c186cf441881b06bc5503d979acb0ab75 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Mon, 23 Oct 2017 09:38:11 -0400
+Subject: [PATCH] Include sys/time.h for struct timeval
+
+This is needed with musl.
+
+Upstream-Status: Accepted
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ Release/include/cpprest/asyncrt_utils.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h
+index 8faa2dc..aab87a5 100644
+--- a/Release/include/cpprest/asyncrt_utils.h
++++ b/Release/include/cpprest/asyncrt_utils.h
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #ifndef _WIN32
++#include <sys/time.h>
+ #include <boost/algorithm/string.hpp>
+ #if !defined(ANDROID) && !defined(__ANDROID__) && defined(HAVE_XLOCALE_H) // CodePlex 269
+ /* Systems using glibc: xlocale.h has been removed from glibc 2.26
+-- 
+2.13.6
+
diff --git a/package/libcpprestsdk/0003-fix-strand.patch b/package/libcpprestsdk/0003-fix-strand.patch
new file mode 100644 (file)
index 0000000..f5710b3
--- /dev/null
+++ b/package/libcpprestsdk/0003-fix-strand.patch
@@ -0,0 +1,28 @@
+From e75d642726c4c78c368e74660ef4bc5503f3ec12 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@codeblue.com>
+Date: Sun, 14 Jan 2018 14:44:02 -0500
+Subject: [PATCH] fix strand
+
+From upstream, fixes compiling against boost 1.66 strand.
+
+Commit IDs 6b2e0480018530b616f61d5cdc786c92ba148bb7
+
+Signed-off-by: Adam Duskett <aduskett@codeblue.com>
+---
+ Release/include/pplx/threadpool.h                                  | 2 +-
+ Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
+index 0be40f6b..395632c3 100644
+--- a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
++++ b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
+@@ -422,7 +422,7 @@ class connection : public config::socket_type::socket_con_type {
+         m_io_service = io_service;
+ 
+         if (config::enable_multithreading) {
+-            m_strand = lib::make_shared<boost::asio::strand>(
++            m_strand = lib::make_shared<boost::asio::io_service::strand>(
+                 lib::ref(*io_service));
+ 
+             m_async_read_handler = m_strand->wrap(lib::bind(
diff --git a/package/libcpprestsdk/Config.in b/package/libcpprestsdk/Config.in
new file mode 100644 (file)
index 0000000..64c383c
--- /dev/null
+++ b/package/libcpprestsdk/Config.in
@@ -0,0 +1,30 @@
+config BR2_PACKAGE_LIBCPPRESTSDK
+       bool "libcpprestsdk"
+       depends on BR2_INSTALL_LIBSTDCPP
+       depends on BR2_TOOLCHAIN_HAS_THREADS # boost
+       depends on BR2_USE_WCHAR # boost
+       depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
+       select BR2_PACKAGE_BOOST
+       select BR2_PACKAGE_BOOST_ATOMIC
+       select BR2_PACKAGE_BOOST_CHRONO
+       select BR2_PACKAGE_BOOST_DATE_TIME
+       select BR2_PACKAGE_BOOST_FILESYSTEM
+       select BR2_PACKAGE_BOOST_RANDOM
+       select BR2_PACKAGE_BOOST_REGEX
+       select BR2_PACKAGE_BOOST_THREAD
+       select BR2_PACKAGE_OPENSSL
+       select BR2_PACKAGE_ZLIB
+       help
+         The C++ REST SDK is a Microsoft project for cloud-based
+         client-server communication in native code using a modern
+         asynchronous C++ API design. This project aims to help C++
+         developers connect to and interact with services.
+
+         https://github.com/Microsoft/cpprestsdk
+
+comment "libcpprestsdk needs a toolchain w/ C++, wchar, threads"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
+               || !BR2_USE_WCHAR
+
+comment "libcpprestsdk needs exception_ptr"
+       depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/package/libcpprestsdk/libcpprestsdk.hash b/package/libcpprestsdk/libcpprestsdk.hash
new file mode 100644 (file)
index 0000000..0bddfc9
--- /dev/null
+++ b/package/libcpprestsdk/libcpprestsdk.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 f38bc48e6fca969de794dcd65889df6563855cee5ff99742dafc6b2869976e71        libcpprestsdk-v2.10.1.tar.gz
+sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97        license.txt
diff --git a/package/libcpprestsdk/libcpprestsdk.mk b/package/libcpprestsdk/libcpprestsdk.mk
new file mode 100644 (file)
index 0000000..4aafa6e
--- /dev/null
+++ b/package/libcpprestsdk/libcpprestsdk.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libcpprestsdk
+#
+################################################################################
+
+LIBCPPRESTSDK_VERSION = v2.10.1
+LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION))
+LIBCPPRESTSDK_LICENSE = MIT
+LIBCPPRESTSDK_LICENSE_FILES = license.txt
+LIBCPPRESTSDK_SUBDIR = Release
+LIBCPPRESTSDK_DEPENDENCIES += boost openssl zlib
+LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF
+
+$(eval $(cmake-package))