diff options
| author | Pratik Chowdhury <pratikc@live.co.uk> | 2021-05-04 02:47:06 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 14:17:06 -0700 |
| commit | 8f03e2264da6b95fa5b01dd89cdd5b499458d428 (patch) | |
| tree | 4db375407ed8f534862d6cc5a49e29a3d25c7fb3 | |
| parent | 82583bb6fec57279f31cbcb42c41bfcb18647d5b (diff) | |
| download | vcpkg-8f03e2264da6b95fa5b01dd89cdd5b499458d428.tar.gz vcpkg-8f03e2264da6b95fa5b01dd89cdd5b499458d428.zip | |
[asio] Add inline dummy return patch (#17611)
| -rw-r--r-- | ports/asio/inline_dummy_return.patch | 13 | ||||
| -rw-r--r-- | ports/asio/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/asio/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/a-/asio.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
5 files changed, 22 insertions, 1 deletions
diff --git a/ports/asio/inline_dummy_return.patch b/ports/asio/inline_dummy_return.patch new file mode 100644 index 000000000..7df7ca641 --- /dev/null +++ b/ports/asio/inline_dummy_return.patch @@ -0,0 +1,13 @@ +diff --git a/asio/include/asio/impl/use_awaitable.hpp b/asio/include/asio/impl/use_awaitable.hpp +index 60a6f5cd..af7be635 100644 +--- a/asio/include/asio/impl/use_awaitable.hpp ++++ b/asio/include/asio/impl/use_awaitable.hpp +@@ -236,7 +236,7 @@ T dummy_return() + } + + template <> +-void dummy_return() ++inline void dummy_return() + { + } + #endif // defined(_MSC_VER) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 09bd3402c..af3683874 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF asio-1-18-1 SHA512 c84e6fca448ed419a976756840f3f4543291a5a7d4f62d4de7c06945b2cd9ececca6633049ad5e36367d60f67a4f2735be017445514ae9fa9497d4af2a4d48f8 HEAD_REF master + PATCHES + inline_dummy_return.patch ) # Always use "ASIO_STANDALONE" to avoid boost dependency diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 38140acc5..076b4f608 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "asio", "version": "1.18.1", + "port-version": 1, "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", "documentation": "https://think-async.com/Asio/asio-1.18.0/doc/", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index d9e24002c..abb512925 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "09afe8ce875f1c4e5e46d54c7c8bd5d0b9b512fc", + "version": "1.18.1", + "port-version": 1 + }, + { "git-tree": "f564160afbc91228b0fe5c48f8f4c0b7dcd99b31", "version": "1.18.1", "port-version": 0 diff --git a/versions/baseline.json b/versions/baseline.json index 5f11b1b2d..c894511d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -154,7 +154,7 @@ }, "asio": { "baseline": "1.18.1", - "port-version": 0 + "port-version": 1 }, "asiosdk": { "baseline": "2.3.3-1", |