diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-09-24 15:15:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 15:15:06 -0700 |
| commit | 4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3 (patch) | |
| tree | 371509cc59c45895c85e5e049aaa2cd9c39cc7b0 /ports/mosquitto/support-static-build.patch | |
| parent | c1acea1f044d3300b0c3791c2ce74d53e5a15548 (diff) | |
| download | vcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.tar.gz vcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.zip | |
[vcpkg macos ci] Switch to using our own base boxes, to fix bringing up mac machines (#13619)
* [vcpkg ci:osx] Remove brew install
* add instructions for creating a new vagrant box
* fix the vagrant scripts for the new box
* finish fixing the setup
* [mecab jxrlib] fix ports for CI
mecab needed to use an actual ref that wasn't master,
and jxrlib needed a patch for xcode 12 CLTs.
Additionally, this fixes the mecab version to be a date, the date of the last commit,
since `1.0` is not the correct version (mecab doesn't have released versions)
* [many ports] fix compile with Xcode 12 CLTs
This mostly means fixing errors on implicit-function-declaration,
and removing some Werrors
* alac-decoder
* apr
* argtable2
* arrow
* hyperscan
* mcpp
* minizip
* mosquitto
* stormlib
* [many ports] even more Xcode 12 CLT fixes
* [jxrlib darknet] fix the last ports! (hopefully)
* CRs, plus minor wip changes to osx scripts
Diffstat (limited to 'ports/mosquitto/support-static-build.patch')
| -rw-r--r-- | ports/mosquitto/support-static-build.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/ports/mosquitto/support-static-build.patch b/ports/mosquitto/support-static-build.patch deleted file mode 100644 index 28d7d779a..000000000 --- a/ports/mosquitto/support-static-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index bd60b75..cc01a2a 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -60,7 +60,7 @@ if (UNIX AND NOT APPLE)
- endif (UNIX AND NOT APPLE)
-
- if (WIN32)
-- set (LIBRARIES ${LIBRARIES} ws2_32)
-+ set (LIBRARIES ${LIBRARIES} ws2_32 crypt32)
- endif (WIN32)
-
- if (WITH_SRV)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7898ff5..23b3fe8 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -158,7 +158,7 @@ if (UNIX)
- endif (UNIX)
-
- if (WIN32)
-- set (MOSQ_LIBS ${MOSQ_LIBS} ws2_32)
-+ set (MOSQ_LIBS ${MOSQ_LIBS} ws2_32 crypt32)
- 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)
|