Skip to contentSkip to conversation

package/libcpprestsdk: bump to version 2.10.16

PATCH New aduskett at gmail.com 2 participants 2 messages Jun 14, 2020 – Jun 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libcpprestsdk: bump to version 2.10.16

From: Adam Duskett <[email protected]>

Other changes:
- Remove upstream patch

---
 ...sdk-fix-building-as-a-static-library.patch | 38 -------------------
 package/libcpprestsdk/libcpprestsdk.hash      |  2 +-
 package/libcpprestsdk/libcpprestsdk.mk        |  2 +-
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch
package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch deleted +0 -38
deleted file mode 100644
index de900178d5..0000000000
@@ -1,38 +0,0 @@
-From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <[email protected]>
-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 <[email protected]>
----
- 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
-
package/libcpprestsdk/libcpprestsdk.hash +1 -1
index 1f79a4ad95..e76522f6ee 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  1c027a53457e87b0b3a475e5c8045b94400c475898c8bd51b0fbd218b99a7f7b  libcpprestsdk-2.10.15.tar.gz
+sha256  3d75e17c7d79131320438f2a15331f7ca6281c38c0e2daa27f051e290eeb8681  libcpprestsdk-2.10.16.tar.gz
 sha256  5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97  license.txt
package/libcpprestsdk/libcpprestsdk.mk +1 -1
index 69ff9f17cc..d8525cfe1b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCPPRESTSDK_VERSION = 2.10.15
+LIBCPPRESTSDK_VERSION = 2.10.16
 LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,v$(LIBCPPRESTSDK_VERSION))
 LIBCPPRESTSDK_LICENSE = MIT
 LIBCPPRESTSDK_LICENSE_FILES = license.txt
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 package/libcpprestsdk: bump to version 2.10.16

Quoted 5 lines · On Sun, 14 Jun 2020 14:30:40 -0700 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

Other changes:
- Remove upstream patch

Quoted 7 lines
---
 ...sdk-fix-building-as-a-static-library.patch | 38 -------------------
 package/libcpprestsdk/libcpprestsdk.hash      |  2 +-
 package/libcpprestsdk/libcpprestsdk.mk        |  2 +-
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com