diff options
| author | myd7349 <myd7349@gmail.com> | 2019-09-21 10:10:14 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-09-20 19:10:14 -0700 |
| commit | 5c5c9ea14626bc137e10c6db8206f70b382498c1 (patch) | |
| tree | 9d3895f721df4f85b7b9b10056e6589053f8bf1c | |
| parent | 7fceb4d4682f680fe7f14cc47a636a67571a5b7f (diff) | |
| download | vcpkg-5c5c9ea14626bc137e10c6db8206f70b382498c1.tar.gz vcpkg-5c5c9ea14626bc137e10c6db8206f70b382498c1.zip | |
[zeromq] Update to 2019-09-13 (#8119)
* [zeromq] Update to 2019-09-10
* [zeromq] Update to 2019-09-13
* [zeromq] Rename websockets features
| -rw-r--r-- | ports/zeromq/CONTROL | 5 | ||||
| -rw-r--r-- | ports/zeromq/portfile.cmake | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index d0dbe6be9..e334fab7c 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,8 +1,11 @@ Source: zeromq -Version: 2019-07-09-1 +Version: 2019-09-20 Homepage: https://github.com/zeromq/libzmq Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products Feature: sodium Description: Using libsodium for CURVE security Build-Depends: libsodium + +Feature: websockets-sha1 +Description: Enable WebSocket transport through builtin sha1 (libzmq#3676) diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 7f42cf521..4df376a1b 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -3,16 +3,20 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF b5db4b4421c8b2766321e70e5e9ca07c197fac47 - SHA512 e1166b9eec3c0613c2b085bf995e6d711554ba77e180f7b86aa2d04157f2ab7dca8131b855568f8fc931ac256628f6018e6bc67bc9fbecfd498776b4151d6e63 + REF 8d34332ff2301607df0fc9971a2fbe903c0feb7c + SHA512 8b3a9b6c4e5236353672b6deb64c94ac79deb116962405f01fe36e2fd8ddc48ec65d88ffc06746ce2e13c93eaeb04e4ba73de8f9d6f2a57a73111765d5ba8ad7 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - sodium WITH_LIBSODIUM +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sodium WITH_LIBSODIUM + INVERTED_FEATURES + websockets-sha1 DISABLE_WS ) vcpkg_configure_cmake( @@ -24,6 +28,8 @@ vcpkg_configure_cmake( -DBUILD_STATIC=${BUILD_STATIC} -DBUILD_SHARED=${BUILD_SHARED} -DWITH_PERF_TOOL=OFF + -DWITH_DOCS=OFF + -DWITH_NSS=OFF ${FEATURE_OPTIONS} OPTIONS_DEBUG "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" |