Update buildroot & docker (#25)
* Update docker & buildroot * Fix * fix versions
This commit is contained in:
Pascal Vizeli
@@ -1,55 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
From 546e89a29a82cc4f7de6c99be5a07221aa7443df Mon Sep 17 00:00:00 2001
|
||||
From: Adam Duskett <aduskett@gmail.com>
|
||||
Date: Fri, 9 Mar 2018 08:09:52 -0500
|
||||
Subject: [PATCH] fix template whitespace syntax
|
||||
|
||||
Some files don't have a space inbetween the '<' and '::' charachters, which
|
||||
will cause build failures on older toolchains. Adding a space inbetween these
|
||||
two characters fixes the issue.
|
||||
|
||||
upstream-status: pending
|
||||
https://github.com/Microsoft/cpprestsdk/pull/715
|
||||
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
Release/include/cpprest/details/web_utilities.h | 2 +-
|
||||
Release/include/cpprest/http_client.h | 2 +-
|
||||
Release/include/cpprest/json.h | 2 +-
|
||||
Release/include/cpprest/ws_client.h | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Release/include/cpprest/details/web_utilities.h b/Release/include/cpprest/details/web_utilities.h
|
||||
index ba641654..9855c315 100644
|
||||
--- a/Release/include/cpprest/details/web_utilities.h
|
||||
+++ b/Release/include/cpprest/details/web_utilities.h
|
||||
@@ -33,7 +33,7 @@ class zero_memory_deleter
|
||||
public:
|
||||
_ASYNCRTIMP void operator()(::utility::string_t *data) const;
|
||||
};
|
||||
-typedef std::unique_ptr<::utility::string_t, zero_memory_deleter> plaintext_string;
|
||||
+typedef std::unique_ptr< ::utility::string_t, zero_memory_deleter> plaintext_string;
|
||||
|
||||
#if defined(_WIN32) && !defined(CPPREST_TARGET_XP)
|
||||
#if defined(__cplusplus_winrt)
|
||||
diff --git a/Release/include/cpprest/http_client.h b/Release/include/cpprest/http_client.h
|
||||
index a936a23e..f5ad8fac 100644
|
||||
--- a/Release/include/cpprest/http_client.h
|
||||
+++ b/Release/include/cpprest/http_client.h
|
||||
@@ -757,7 +757,7 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
- std::shared_ptr<::web::http::client::http_pipeline> m_pipeline;
|
||||
+ std::shared_ptr< ::web::http::client::http_pipeline> m_pipeline;
|
||||
};
|
||||
|
||||
namespace details {
|
||||
diff --git a/Release/include/cpprest/json.h b/Release/include/cpprest/json.h
|
||||
index 07c54502..dfdeead4 100644
|
||||
--- a/Release/include/cpprest/json.h
|
||||
+++ b/Release/include/cpprest/json.h
|
||||
@@ -301,7 +301,7 @@ public:
|
||||
/// <param name="fields">Field names associated with JSON values</param>
|
||||
/// <param name="keep_order">Whether to preserve the original order of the fields</param>
|
||||
/// <returns>A non-empty JSON object value</returns>
|
||||
- static _ASYNCRTIMP json::value __cdecl object(std::vector<std::pair<::utility::string_t, value>> fields, bool keep_order = false);
|
||||
+ static _ASYNCRTIMP json::value __cdecl object(std::vector<std::pair< ::utility::string_t, value>> fields, bool keep_order = false);
|
||||
|
||||
/// <summary>
|
||||
/// Creates an empty JSON array
|
||||
diff --git a/Release/include/cpprest/ws_client.h b/Release/include/cpprest/ws_client.h
|
||||
index 9a324cde..98f933e1 100644
|
||||
--- a/Release/include/cpprest/ws_client.h
|
||||
+++ b/Release/include/cpprest/ws_client.h
|
||||
@@ -184,7 +184,7 @@ public:
|
||||
/// <returns>Vector of all the subprotocols </returns>
|
||||
/// <remarks>If you want all the subprotocols in a comma separated string
|
||||
/// they can be directly looked up in the headers using 'Sec-WebSocket-Protocol'.</remarks>
|
||||
- _ASYNCRTIMP std::vector<::utility::string_t> subprotocols() const;
|
||||
+ _ASYNCRTIMP std::vector< ::utility::string_t> subprotocols() const;
|
||||
|
||||
/// <summary>
|
||||
/// Gets the server certificate validation property.
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
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(
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 f38bc48e6fca969de794dcd65889df6563855cee5ff99742dafc6b2869976e71 libcpprestsdk-v2.10.1.tar.gz
|
||||
sha256 fb0b611007732d8de9528bc37bd67468e7ef371672f89c88f225f73cdc4ffcf1 libcpprestsdk-v2.10.2.tar.gz
|
||||
sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCPPRESTSDK_VERSION = v2.10.1
|
||||
LIBCPPRESTSDK_VERSION = v2.10.2
|
||||
LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION))
|
||||
LIBCPPRESTSDK_LICENSE = MIT
|
||||
LIBCPPRESTSDK_LICENSE_FILES = license.txt
|
||||
|
||||
Reference in New Issue
Block a user