zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpprestsdk: fix common error and, use boost@1.69.0 or lower (#15463)

Browse Source
This commit is contained in:
noguchi-k 2020-03-13 06:09:07 +09:00 committed by GitHub
parent f2a13af43e
commit fddca6312c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
var/spack/repos/builtin/packages/cpprestsdk/Release.patch Normal file
View File

@ -0,0 +1,45 @@
diff -ur spack-src/Release.org/include/pplx/pplxlinux.h spack-src/Release/include/pplx/pplxlinux.h
--- spack-src/Release.org/include/pplx/pplxlinux.h 2020-03-12 13:52:40.161917503 +0900
+++ spack-src/Release/include/pplx/pplxlinux.h 2020-03-12 14:05:50.834896829 +0900
@@ -240,6 +240,11 @@
{
public:
_PPLXIMP virtual void schedule( TaskProc_t proc, _In_ void* param);
+#if defined(__APPLE__)
+ virtual ~apple_scheduler() {}
+#else
+ virtual ~linux_scheduler() {}
+#endif
};
} // namespace details
diff -ur spack-src/Release.org/libs/websocketpp/websocketpp/transport/asio/connection.hpp spack-src/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
--- spack-src/Release.org/libs/websocketpp/websocketpp/transport/asio/connection.hpp 2020-03-12 13:52:40.201921703 +0900
+++ spack-src/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp 2020-03-12 14:09:13.586186467 +0900
@@ -422,7 +422,7 @@
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(
diff -ur spack-src/Release.org/src/uri/uri.cpp spack-src/Release/src/uri/uri.cpp
--- spack-src/Release.org/src/uri/uri.cpp 2020-03-12 13:52:40.241925902 +0900
+++ spack-src/Release/src/uri/uri.cpp 2020-03-12 13:53:58.610152210 +0900
@@ -22,12 +22,12 @@
// canonicalize components first
// convert scheme to lowercase
- std::transform(m_scheme.begin(), m_scheme.end(), m_scheme.begin(), [this](utility::char_t c) {
+ std::transform(m_scheme.begin(), m_scheme.end(), m_scheme.begin(), [](utility::char_t c) {
return (utility::char_t)tolower(c);
});
// convert host to lowercase
- std::transform(m_host.begin(), m_host.end(), m_host.begin(), [this](utility::char_t c) {
+ std::transform(m_host.begin(), m_host.end(), m_host.begin(), [](utility::char_t c) {
return (utility::char_t)tolower(c);
});

7
var/spack/repos/builtin/packages/cpprestsdk/package.py
View File

@ -17,6 +17,11 @@ class Cpprestsdk(CMakePackage):
version('2.9.1', sha256='537358760acd782f4d2ed3a85d92247b4fc423aff9c85347dc31dbb0ab9bab16')
depends_on('boost')
depends_on('boost@:1.69.0')
# Ref: https://github.com/microsoft/cpprestsdk/commit/f9f518e4ad84577eb684ad8235181e4495299af4
# Ref: https://github.com/Microsoft/cpprestsdk/commit/6b2e0480018530b616f61d5cdc786c92ba148bb7
# Ref: https://github.com/microsoft/cpprestsdk/commit/70c1b14f39f5d47984fdd8a31fc357ebb5a37851
patch('Release.patch')
root_cmakelists_dir = 'Release'