diff options
| author | An Tao <antao2002@gmail.com> | 2021-01-25 16:16:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 00:16:36 -0800 |
| commit | 496f9e4fa46ad65e79a6ffb0185996d92c076eec (patch) | |
| tree | 4125eb3ce6c625840e66ddaecdc81685792e0b0a | |
| parent | c9977384354ac363d9ef09768aa0ed0affe63293 (diff) | |
| download | vcpkg-496f9e4fa46ad65e79a6ffb0185996d92c076eec.tar.gz vcpkg-496f9e4fa46ad65e79a6ffb0185996d92c076eec.zip | |
[trantor] Update to 1.2.0 (#15841)
* [trantor] Update to 1.2.0
* Add versions file
| -rw-r--r-- | ports/trantor/CONTROL | 2 | ||||
| -rw-r--r-- | ports/trantor/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/trantor/vcpkg.patch | 14 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/trantor.json | 5 |
5 files changed, 25 insertions, 4 deletions
diff --git a/ports/trantor/CONTROL b/ports/trantor/CONTROL index 88be5a34a..5349726cc 100644 --- a/ports/trantor/CONTROL +++ b/ports/trantor/CONTROL @@ -1,5 +1,5 @@ Source: trantor -Version: 1.1.1 +Version: 1.2.0 Homepage: https://github.com/an-tao/trantor Description: A non-blocking I/O cross-platform TCP network library, using C++14. Build-Depends: openssl, c-ares diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index b5620907a..eb835a13e 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.1.1 - SHA512 525316b88a96acc90cf21aa0d6dc74ccbeb1bf55dda39cd6fb0344f3672e61db37621614d742666fd54c28448e0fbc4cedebda10cadb97a225be9481a6fbd9e2 + REF v1.2.0 + SHA512 2d94ef174642c81e1db62621ae8bc98a5b439f90437af4fa0ab67d09646bb04847b07a8be305331807dad4ef9244b06636ef471ce9da15ce23fc8bed4ff1d9e2 HEAD_REF master + PATCHES + vcpkg.patch ) vcpkg_configure_cmake( diff --git a/ports/trantor/vcpkg.patch b/ports/trantor/vcpkg.patch new file mode 100644 index 000000000..f5b23d647 --- /dev/null +++ b/ports/trantor/vcpkg.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d164667..e75b869 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,6 +90,9 @@ if(c-ares_FOUND) + message(STATUS "c-ares found!") + target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) + set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc) ++ if(APPLE) ++ target_link_libraries(${PROJECT_NAME} PRIVATE resolv) ++ endif() + else() + set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/NormalResolver.cc) + endif() diff --git a/versions/baseline.json b/versions/baseline.json index 67fe34aeb..5fb557730 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5841,7 +5841,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.1.1", + "baseline": "1.2.0", "port-version": 0 }, "tre": { diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index fc225ffc3..f4a822e2e 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "af52c9e7b3dd398e61ef6ea0a34a48cdcfce7f42", + "version-string": "1.2.0", + "port-version": 0 + }, + { "git-tree": "0df63258899007bb9f8fa2027ab3f0b3a3807251", "version-string": "1.1.1", "port-version": 0 |