diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-oe/recipes-support/cpprest | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-support/cpprest')
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/950-fix.patch | 26 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch | 40 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch | 201 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch | 103 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch | 38 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb (renamed from external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.7.bb) | 14 |
6 files changed, 118 insertions, 304 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/950-fix.patch b/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/950-fix.patch deleted file mode 100644 index 3ae46a11..00000000 --- a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/950-fix.patch +++ /dev/null @@ -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; diff --git a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch b/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch index 75f74ec6..3ff7f0dd 100644 --- a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch +++ b/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch @@ -3,23 +3,23 @@ Author: Gianfranco Costamagna <locutusofborg@debian.org> Last-Update: 2017-10-28 Forwarded: https://github.com/Microsoft/cpprestsdk/issues/576 ---- casablanca-2.10.0.orig/Release/tests/functional/streams/istream_tests.cpp -+++ casablanca-2.10.0/Release/tests/functional/streams/istream_tests.cpp -@@ -1302,7 +1302,7 @@ void compare_float(float expected, float - { - compare_floating(expected, actual, FLT_EPSILON); - } -- -+/* - TEST(extract_floating_point) - { - std::string test_string; -@@ -1349,7 +1349,7 @@ TEST(extract_floating_point) - VERIFY_ARE_EQUAL(1 / expected, 1 / actual); - } while (!std_istream.eof()); - } -- -+*/ - TEST(extract_floating_point_with_exceptions) - { - std::vector<std::pair<std::string, std::string>> tests; +Index: cpprest/Release/tests/functional/streams/istream_tests.cpp +=================================================================== +--- cpprest.orig/Release/tests/functional/streams/istream_tests.cpp ++++ cpprest/Release/tests/functional/streams/istream_tests.cpp +@@ -1297,6 +1297,7 @@ + void compare_double(double expected, double actual) { compare_floating(expected, actual, DBL_EPSILON); } + void compare_float(float expected, float actual) { compare_floating(expected, actual, FLT_EPSILON); } + ++ /* + TEST(extract_floating_point) + { + std::string test_string; +@@ -1343,6 +1344,7 @@ + if (expected == 0) VERIFY_ARE_EQUAL(1 / expected, 1 / actual); + } while (!std_istream.eof()); + } ++ */ + + TEST(extract_floating_point_with_exceptions) + { diff --git a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch index 2dff0d97..5f1f8a9f 100644 --- a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ b/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -6,10 +6,10 @@ Forwarded: not-needed Reviewed-By: Gianfranco Costamagna <locutusofborg@debian.org> Last-Update: 2015-11-25 -Index: casablanca/Release/tests/functional/http/client/CMakeLists.txt +Index: cpprest/Release/tests/functional/http/client/CMakeLists.txt =================================================================== ---- casablanca.orig/Release/tests/functional/http/client/CMakeLists.txt -+++ casablanca/Release/tests/functional/http/client/CMakeLists.txt +--- cpprest.orig/Release/tests/functional/http/client/CMakeLists.txt ++++ cpprest/Release/tests/functional/http/client/CMakeLists.txt @@ -12,7 +12,6 @@ multiple_requests.cpp oauth1_tests.cpp @@ -18,125 +18,110 @@ Index: casablanca/Release/tests/functional/http/client/CMakeLists.txt pipeline_stage_tests.cpp progress_handler_tests.cpp proxy_tests.cpp -Index: casablanca/Release/tests/functional/http/client/authentication_tests.cpp +Index: cpprest/Release/tests/functional/http/client/authentication_tests.cpp =================================================================== ---- casablanca.orig/Release/tests/functional/http/client/authentication_tests.cpp -+++ casablanca/Release/tests/functional/http/client/authentication_tests.cpp -@@ -663,15 +663,19 @@ - VERIFY_ARE_EQUAL(return_code, response.status_code()); - } +--- cpprest.orig/Release/tests/functional/http/client/authentication_tests.cpp ++++ cpprest/Release/tests/functional/http/client/authentication_tests.cpp +@@ -675,9 +675,9 @@ + VERIFY_ARE_EQUAL(return_code, response.status_code()); + } -+/* - TEST(auth_no_data) - { - auth_test_impl(false); - } -+*/ +- TEST(auth_no_data) { auth_test_impl(false); } ++ //TEST(auth_no_data) { auth_test_impl(false); } -+/* - TEST(unsuccessful_auth_with_basic_cred) - { - auth_test_impl(true); - } -+*/ +- TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } ++ //TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } + + TEST_FIXTURE(uri_address, set_user_options_asio_http) + { +@@ -695,6 +695,7 @@ + VERIFY_ARE_EQUAL(200, response.status_code()); + } + ++ /* + TEST_FIXTURE(uri_address, set_user_options_asio_https) + { + handle_timeout([] { +@@ -714,6 +715,7 @@ + VERIFY_IS_FALSE(v.empty()); + }); + } ++ */ - TEST_FIXTURE(uri_address, set_user_options_asio_http) - { -@@ -692,7 +696,7 @@ - auto response = client.request(methods::GET).get(); - VERIFY_ARE_EQUAL(200, response.status_code()); - } -- -+/* - TEST_FIXTURE(uri_address, set_user_options_asio_https) - { - handle_timeout([] -@@ -714,7 +718,7 @@ - VERIFY_IS_FALSE(v.empty()); - }); - } -- -+*/ #endif - } // SUITE(authentication_tests) -Index: casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp +Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp =================================================================== ---- casablanca.orig/Release/tests/functional/websockets/client/authentication_tests.cpp -+++ casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp -@@ -86,7 +86,7 @@ - } - return false; - } -- -+/* - TEST(ssl_test) - { - websocket_client client; -@@ -122,7 +122,7 @@ - throw; +--- cpprest.orig/Release/tests/functional/websockets/client/authentication_tests.cpp ++++ cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp +@@ -93,6 +93,7 @@ SUITE(authentication_tests) + return false; } - } -- -+*/ - // These tests are specific to our websocketpp based implementation. - #if !defined(__cplusplus_winrt) -@@ -153,14 +153,15 @@ - throw; ++ /* + TEST(ssl_test) + { + websocket_client client; +@@ -127,6 +128,7 @@ SUITE(authentication_tests) + throw; + } } - } -- -+/* - // Test specifically for server SignalR team hit interesting cases with. - TEST(sni_with_older_server_test) - { - websocket_client client; - sni_test_impl(client); - } -- -+*/ -+/* - // WinRT doesn't expose option for disabling. - // No stable server is available to reliably test this. - // The configuration below relies on a timeout in the success case. -@@ -188,7 +189,8 @@ - throw; ++ */ + + void handshake_error_test_impl(const ::utility::string_t& host) + { +@@ -148,11 +150,11 @@ SUITE(authentication_tests) + } } - } -- -+*/ -+/* - // Winrt doesn't allow explicitly setting server host for SNI. - TEST(sni_explicit_hostname) - { -@@ -199,7 +201,7 @@ - websocket_client client(config); - sni_test_impl(client); - } -- -+*/ - void handshake_error_test_impl(const ::utility::string_t &host) - { - websocket_client client; -Index: casablanca/Release/tests/functional/http/client/connections_and_errors.cpp + +- TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } ++ //TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } + +- TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } ++ //TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } + +- TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } ++ //TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } + + } // SUITE(authentication_tests) + +Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp =================================================================== ---- casablanca.orig/Release/tests/functional/http/client/connections_and_errors.cpp -+++ casablanca/Release/tests/functional/http/client/connections_and_errors.cpp -@@ -415,6 +415,7 @@ - } +--- cpprest.orig/Release/tests/functional/http/client/connections_and_errors.cpp ++++ cpprest/Release/tests/functional/http/client/connections_and_errors.cpp +@@ -408,6 +408,7 @@ + } #endif -+/* - // Try to connect to a server on a closed port and cancel the operation. - TEST_FIXTURE(uri_address, cancel_bad_port) - { -@@ -446,7 +447,7 @@ ++ /* + // Try to connect to a server on a closed port and cancel the operation. + TEST_FIXTURE(uri_address, cancel_bad_port) + { +@@ -439,6 +440,7 @@ + + VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); + } ++ */ - VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); - } -- -+*/ } // SUITE(connections_and_errors) - }}}} +--- cpprest-2.10.16.orig/Release/tests/functional/http/client/redirect_tests.cpp ++++ cpprest-2.10.16/Release/tests/functional/http/client/redirect_tests.cpp +@@ -159,7 +159,7 @@ SUITE(redirect_tests) + VERIFY_NO_THROWS(reply.get()); + } + } +- ++/* + TEST(does_not_follow_https_to_http_by_default) + { + handle_timeout([] { +@@ -182,7 +182,7 @@ SUITE(redirect_tests) + ); + }); + } +- ++*/ + TEST_FIXTURE(uri_address, follows_permanent_redirect) + { + #if USING_WINHTTP diff --git a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch b/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch deleted file mode 100644 index 93c3e8a2..00000000 --- a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch +++ /dev/null @@ -1,103 +0,0 @@ -Description: Some tests takes too long on slow architectures and timeouts - We can safely disable them. - e.g. - Release/tests/functional/http/client/connections_and_errors.cpp:142: error: Failure in request_timeout_microsecond: Test case timed out and is hung. Aborting all remaining test cases. Expected under 180000ms. FAILED - -Index: casablanca/Release/tests/functional/http/client/connections_and_errors.cpp -=================================================================== ---- casablanca.orig/Release/tests/functional/http/client/connections_and_errors.cpp -+++ casablanca/Release/tests/functional/http/client/connections_and_errors.cpp -@@ -127,7 +127,7 @@ - // Try sending another request. - VERIFY_THROWS(client.request(methods::GET).wait(), web::http::http_exception); - } -- -+/* - TEST_FIXTURE(uri_address, request_timeout) - { - test_http_server::scoped_server scoped(m_uri); -@@ -146,7 +146,8 @@ - #endif - t.get(); - } -- -+*/ -+/* - TEST_FIXTURE(uri_address, request_timeout_microsecond) - { - pplx::task<test_request*> t; -@@ -168,7 +169,7 @@ - try { t.get(); } - catch (...) {} - } -- -+*/ - TEST_FIXTURE(uri_address, invalid_method) - { - web::http::uri uri(U("http://www.bing.com/")); -Index: casablanca/Release/tests/functional/http/listener/requests_tests.cpp -=================================================================== ---- casablanca.orig/Release/tests/functional/http/listener/requests_tests.cpp -+++ casablanca/Release/tests/functional/http/listener/requests_tests.cpp -@@ -173,7 +173,7 @@ - - listener.close().wait(); - } -- -+/* - TEST_FIXTURE(uri_address, response_order) - { - http_listener listener(m_uri); -@@ -217,7 +217,7 @@ - - listener.close().wait(); - } -- -+*/ - TEST_FIXTURE(uri_address, uri_encoding, "Ignore", "Codeplex 201") - { - http_listener listener(m_uri); -Index: casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp -=================================================================== ---- casablanca.orig/Release/tests/functional/websockets/client/authentication_tests.cpp -+++ casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp -@@ -221,7 +221,7 @@ - VERIFY_ARE_EQUAL("TLS handshake failed", e.error_code().message()); - } - } -- -+/* - TEST(self_signed_cert) - { - handshake_error_test_impl(U("wss://self-signed.badssl.com/")); -@@ -236,7 +236,7 @@ - { - handshake_error_test_impl(U("wss://expired.badssl.com/")); - } -- -+*/ - #endif - - } // SUITE(authentication_tests) -Index: casablanca/Release/tests/functional/websockets/client/client_construction.cpp -=================================================================== ---- casablanca.orig/Release/tests/functional/websockets/client/client_construction.cpp -+++ casablanca/Release/tests/functional/websockets/client/client_construction.cpp -@@ -81,7 +81,7 @@ - VERIFY_ARE_EQUAL(config2.credentials().username(), cred.username()); - } - -- -+/* - // Verify that we can get the baseuri from websocket_client connect. - TEST_FIXTURE(uri_address, uri_test) - { -@@ -101,7 +101,7 @@ - VERIFY_ARE_EQUAL(client2.uri(), m_uri); - client2.close().wait(); - } -- -+*/ - TEST_FIXTURE(uri_address, move_operations) - { - std::string body("hello"); diff --git a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch b/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch deleted file mode 100644 index e6f64772..00000000 --- a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch +++ /dev/null @@ -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() - diff --git a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.7.bb b/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb index 5cc6385d..5d7dbd8b 100644 --- a/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.7.bb +++ b/external/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb @@ -5,19 +5,15 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" DEPENDS = "openssl websocketpp zlib boost brotli" -EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake -DCPPREST_EXCLUDE_BROTLI=OFF" +EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ - file://disable-outside-tests.patch \ - file://disable-test-timeouts.patch \ file://disable-float-tests.patch \ - file://950-fix.patch \ - file://system-brotli.patch \ - " + file://disable-outside-tests.patch " -# tag 2.10.7 -SRCREV= "c4cef129e880a3f9c23a480e8c983793963173bb" +# tag 2.10.16 +SRCREV= "18212a2a7967e12d740bfb957e500892b3463c88" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig |