diff options
| author | Antoine Hoarau <703240+ahoarau@users.noreply.github.com> | 2021-09-28 02:51:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 17:51:07 -0700 |
| commit | 5aec72b4f3f1ccda1176549f58abc24c7ee36ffe (patch) | |
| tree | 1eee9157957a30382463d6ed8fe5fbea9427a588 /ports/mosquitto/0004-support-static-build.patch | |
| parent | ee0584f05066a63073b516605091155ccd99c7d9 (diff) | |
| download | vcpkg-5aec72b4f3f1ccda1176549f58abc24c7ee36ffe.tar.gz vcpkg-5aec72b4f3f1ccda1176549f58abc24c7ee36ffe.zip | |
[mosquitto] Update to 2.0.12 (#20148)
* update mosquitto to 2.0.12
* update json
* Update ports/mosquitto/vcpkg.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/libwebsockets/vcpkg.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* add head ref
* remove plugins
* update jsons
* update libwebsockets
* Update versions/m-/mosquitto.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update versions/l-/libwebsockets.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/mosquitto/portfile.cmake
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* update version
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
Diffstat (limited to 'ports/mosquitto/0004-support-static-build.patch')
| -rw-r--r-- | ports/mosquitto/0004-support-static-build.patch | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/ports/mosquitto/0004-support-static-build.patch b/ports/mosquitto/0004-support-static-build.patch index 55606e7d5..bd3e44d03 100644 --- a/ports/mosquitto/0004-support-static-build.patch +++ b/ports/mosquitto/0004-support-static-build.patch @@ -1,19 +1,25 @@ -From 4bb19e77e95bc505d32e098190ffbf056810017c Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca <mazzucan@outlook.com> -Date: Tue, 22 Sep 2020 15:44:42 -0700 -Subject: [PATCH 4/5] support static build - ---- - lib/CMakeLists.txt | 2 +- - src/CMakeLists.txt | 8 ++++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - +diff --git a/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt +index 13a7d826..31069306 100644 +--- a/apps/mosquitto_passwd/CMakeLists.txt ++++ b/apps/mosquitto_passwd/CMakeLists.txt +@@ -13,6 +13,10 @@ if (WITH_TLS) + ) + + +- target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) ++ if(WIN32) ++ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES} ws2_32 crypt32) ++ else() ++ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) ++ endif() + install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + endif (WITH_TLS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index bd60b75..cc01a2a 100644 +index 5da221dc..c3e9fce0 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -60,7 +60,7 @@ if (UNIX AND NOT APPLE) - endif (UNIX AND NOT APPLE) +@@ -69,7 +69,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID) + endif (UNIX AND NOT APPLE AND NOT ANDROID) if (WIN32) - set (LIBRARIES ${LIBRARIES} ws2_32) @@ -22,10 +28,10 @@ index bd60b75..cc01a2a 100644 if (WITH_SRV) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7898ff5..f066aea 100644 +index 9380a046..62ce99e5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -158,7 +158,7 @@ if (UNIX) +@@ -189,7 +189,7 @@ if (UNIX) endif (UNIX) if (WIN32) @@ -34,18 +40,3 @@ index 7898ff5..f066aea 100644 endif (WIN32) if (WITH_WEBSOCKETS) -@@ -189,6 +189,10 @@ install(FILES mosquitto_broker.h mosquitto_plugin.h DESTINATION "${CMAKE_INSTALL - - if (WITH_TLS) - add_executable(mosquitto_passwd mosquitto_passwd.c) -- target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) -+ if(WIN32) -+ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES} ws2_32 crypt32) -+ else() -+ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) -+ endif() - install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - endif (WITH_TLS) --- -2.24.3 (Apple Git-128) - |