helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpprest: fix build failures on 32bit systems, by reverting two upstream commits

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gianfranco Costamagna 2019-03-28 15:25:13 +01:00 committed by Khem Raj
parent bfee8410b4
commit 5941b5bc8f
3 changed files with 1585 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta-oe/recipes-support/cpprest/cpprest/revert-9b670e5b33dfdbd501d618cd7e7498148ffbd559.patch Normal file
View File

@ -0,0 +1,26 @@
Description: revert upstream bugfix (see:https://github.com/Microsoft/cpprestsdk/issues/1090)
Last-Update: 2019-03-28
--- cpprest-2.10.12.orig/Release/src/utilities/asyncrt_utils.cpp
+++ cpprest-2.10.12/Release/src/utilities/asyncrt_utils.cpp
@@ -1393,16 +1393,15 @@ utility::seconds __cdecl timespan::xml_d
return utility::seconds(numSecs);
}
-static const char c_allowed_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-static const int chars_count = static_cast<int>(sizeof(c_allowed_chars) - 1);
+static const utility::char_t c_allowed_chars[] =
+ _XPLATSTR("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
utility::string_t nonce_generator::generate()
{
- std::uniform_int_distribution<> distr(0, chars_count - 1);
+ std::uniform_int_distribution<> distr(0, static_cast<int>(sizeof(c_allowed_chars) / sizeof(utility::char_t)) - 1);
utility::string_t result;
result.reserve(length());
- std::generate_n(std::back_inserter(result), length(),
- [&] { return static_cast<utility::char_t>(c_allowed_chars[distr(m_random)]); });
+ std::generate_n(std::back_inserter(result), length(), [&]() { return c_allowed_chars[distr(m_random)]; });
return result;
}

1557
meta-oe/recipes-support/cpprest/cpprest/revert-f10d9f8e214516d2c19aa6ef831ee874a58c0479.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2
meta-oe/recipes-support/cpprest/cpprest_2.10.12.bb
View File

@ -8,6 +8,8 @@ DEPENDS = "openssl websocketpp zlib boost brotli"
EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake -DCPPREST_EXCLUDE_BROTLI=OFF"
SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \
file://revert-9b670e5b33dfdbd501d618cd7e7498148ffbd559.patch \
file://revert-f10d9f8e214516d2c19aa6ef831ee874a58c0479.patch \
"
# tag 2.10.12