Remove upstream patches as well.
Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+++ /dev/null
-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
-
--- /dev/null
+From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Mon, 12 Feb 2018 07:49:34 -0500
+Subject: [PATCH] libcpprestsdk: fix building as a static library
+
+Use pkg-config to find OpenSSL. This will automatically find any
+dependent libraries and put them in the correct order for linking.
+
+Upstream status: submitted
+https://github.com/Microsoft/cpprestsdk/pull/688
+
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ Release/cmake/cpprest_find_openssl.cmake | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Release/cmake/cpprest_find_openssl.cmake b/Release/cmake/cpprest_find_openssl.cmake
+index 0b49a7e..2be8afb 100644
+--- a/Release/cmake/cpprest_find_openssl.cmake
++++ b/Release/cmake/cpprest_find_openssl.cmake
+@@ -41,8 +41,12 @@ function(cpprest_find_openssl)
+ # This should prevent linking against the system provided 0.9.8y
+ set(_OPENSSL_VERSION "")
+ endif()
+- find_package(OpenSSL 1.0.0 REQUIRED)
+-
++ if(UNIX)
++ find_package(PkgConfig REQUIRED)
++ pkg_search_module(OPENSSL openssl REQUIRED)
++ else()
++ find_package(OpenSSL 1.0.0 REQUIRED)
++ endif()
+ INCLUDE(CheckCXXSourceCompiles)
+ set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+ set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
+--
+2.14.3
+
+++ /dev/null
-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
-
+++ /dev/null
-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(
+++ /dev/null
-From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <aduskett@gmail.com>
-Date: Mon, 12 Feb 2018 07:49:34 -0500
-Subject: [PATCH] libcpprestsdk: fix building as a static library
-
-Use pkg-config to find OpenSSL. This will automatically find any
-dependent libraries and put them in the correct order for linking.
-
-Upstream status: submitted
-https://github.com/Microsoft/cpprestsdk/pull/688
-
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
----
- Release/cmake/cpprest_find_openssl.cmake | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/Release/cmake/cpprest_find_openssl.cmake b/Release/cmake/cpprest_find_openssl.cmake
-index 0b49a7e..2be8afb 100644
---- a/Release/cmake/cpprest_find_openssl.cmake
-+++ b/Release/cmake/cpprest_find_openssl.cmake
-@@ -41,8 +41,12 @@ function(cpprest_find_openssl)
- # This should prevent linking against the system provided 0.9.8y
- set(_OPENSSL_VERSION "")
- endif()
-- find_package(OpenSSL 1.0.0 REQUIRED)
--
-+ if(UNIX)
-+ find_package(PkgConfig REQUIRED)
-+ pkg_search_module(OPENSSL openssl REQUIRED)
-+ else()
-+ find_package(OpenSSL 1.0.0 REQUIRED)
-+ endif()
- INCLUDE(CheckCXXSourceCompiles)
- set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
- set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
---
-2.14.3
-
# Locally calculated
-sha256 f38bc48e6fca969de794dcd65889df6563855cee5ff99742dafc6b2869976e71 libcpprestsdk-v2.10.1.tar.gz
+sha256 fb0b611007732d8de9528bc37bd67468e7ef371672f89c88f225f73cdc4ffcf1 libcpprestsdk-v2.10.2.tar.gz
sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt
#
################################################################################
-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
projects / buildroot.git / commitdiff