mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

cpprest: upgrade to version 2.10.8: drop my two patches, now upstream

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gianfranco Costamagna
2018-11-26 06:01:25 +01:00
committed by Khem Raj
parent 92f0db8178
commit 08ba65838f
3 changed files with 2 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/cpprest/cpprest/950-fix.patch
-26
View File
@@ -1,26 +0,0 @@
Origin: upstream
Bug: https://github.com/Microsoft/cpprestsdk/issues/950
Last-Update: 2018-11-04
Index: cpprest/Release/src/utilities/asyncrt_utils.cpp
===================================================================
--- cpprest.orig/Release/src/utilities/asyncrt_utils.cpp
+++ cpprest/Release/src/utilities/asyncrt_utils.cpp
@@ -356,7 +356,7 @@
inline size_t count_utf8_to_utf16(const std::string& s)
{
const size_t sSize = s.size();
- auto sData = reinterpret_cast<const UtilCharInternal_t* const>(s.data());
+ auto const sData = reinterpret_cast<const UtilCharInternal_t*>(s.data());
size_t result{ sSize };
for (size_t index = 0; index < sSize;)
@@ -441,7 +441,7 @@
{
// Save repeated heap allocations, use the length of resulting sequence.
const size_t srcSize = s.size();
- auto srcData = reinterpret_cast<const UtilCharInternal_t* const>(s.data());
+ auto const srcData = reinterpret_cast<const UtilCharInternal_t*>(s.data());
utf16string dest(count_utf8_to_utf16(s), L'\0');
utf16string::value_type* const destData = &dest[0];
size_t destIndex = 0;
meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch
-38
View File
@@ -1,38 +0,0 @@
Description: Find system brotli
Author: Gianfranco Costamagna <locutusofborg@debian.org>
Forwarded: https://github.com/Microsoft/cpprestsdk/pull/952
Last-Update: 2018-11-05
--- cpprest-2.10.7.orig/Release/cmake/cpprest_find_brotli.cmake
+++ cpprest-2.10.7/Release/cmake/cpprest_find_brotli.cmake
@@ -3,8 +3,17 @@ function(cpprest_find_brotli)
return()
endif()
- find_package(unofficial-brotli REQUIRED)
- add_library(cpprestsdk_brotli_internal INTERFACE)
- target_link_libraries(cpprestsdk_brotli_internal INTERFACE unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon)
+ find_package(PkgConfig)
+ pkg_check_modules(BROTLIENC libbrotlienc)
+ pkg_check_modules(BROTLIDEC libbrotlidec)
+ if(BROTLIDEC_FOUND AND BROTLIENC_FOUND)
+ target_link_libraries(cpprest PRIVATE ${BROTLIDEC_LDFLAGS} ${BROTLIENC_LDFLAGS})
+ else(BROTLIDEC_FOUND AND BROTLIENC_FOUND)
+ find_package(unofficial-brotli REQUIRED)
+ add_library(cpprestsdk_brotli_internal INTERFACE)
+ target_link_libraries(cpprestsdk_brotli_internal INTERFACE unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon)
+ target_link_libraries(cpprest PRIVATE cpprestsdk_brotli_internal)
+ endif(BROTLIDEC_FOUND AND BROTLIENC_FOUND)
+
endfunction()
--- cpprest-2.10.7.orig/Release/src/CMakeLists.txt
+++ cpprest-2.10.7/Release/src/CMakeLists.txt
@@ -84,7 +84,6 @@ else()
target_compile_definitions(cpprest PRIVATE -DCPPREST_EXCLUDE_BROTLI=1)
else()
cpprest_find_brotli()
- target_link_libraries(cpprest PRIVATE cpprestsdk_brotli_internal)
endif()
endif()
meta-oe/recipes-support/cpprest/cpprest_2.10.7.bb → meta-oe/recipes-support/cpprest/cpprest_2.10.8.bb
+2 -4
View File
@@ -11,12 +11,10 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste
file://disable-outside-tests.patch \
file://disable-test-timeouts.patch \
file://disable-float-tests.patch \
file://950-fix.patch \
file://system-brotli.patch \
"
# tag 2.10.7
SRCREV= "c4cef129e880a3f9c23a480e8c983793963173bb"
# tag 2.10.8
SRCREV= "204a52610234ac5180e80a6883b62c0ad085f51e"
S = "${WORKDIR}/git"