diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2021-04-30 19:57:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 10:57:53 -0700 |
| commit | c8c95c50c11689920b9c67d88f9028f7553b389b (patch) | |
| tree | 8244fbf7c2187fa243948f73a07eb9ca14fcc2b1 | |
| parent | 4f7901ce6f4a35dc48f85a4eaeb8f5c8fad5a31e (diff) | |
| download | vcpkg-c8c95c50c11689920b9c67d88f9028f7553b389b.tar.gz vcpkg-c8c95c50c11689920b9c67d88f9028f7553b389b.zip | |
[zeromq] Update to 4.3.4 (#17554)
* [zeromq] Update to 4.3.4
Use newly introduced WITH_LIBSODIUM_STATIC build option when linking libsodium statically.
* Update versions
| -rw-r--r-- | ports/zeromq/CONTROL | 4 | ||||
| -rw-r--r-- | ports/zeromq/portfile.cmake | 18 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/z-/zeromq.json | 5 |
4 files changed, 14 insertions, 17 deletions
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index e2f7b0b99..4cf6d33c4 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,6 +1,6 @@ Source: zeromq -Version: 2019-09-20 -Port-Version: 2 +Version: 4.3.4 +Port-Version: 0 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 diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 7ec044646..650e7baad 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -1,9 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF 8d34332ff2301607df0fc9971a2fbe903c0feb7c - SHA512 8b3a9b6c4e5236353672b6deb64c94ac79deb116962405f01fe36e2fd8ddc48ec65d88ffc06746ce2e13c93eaeb04e4ba73de8f9d6f2a57a73111765d5ba8ad7 - HEAD_REF master + REF v4.3.4 + SHA512 ad828b1ab5a87983285a6b44b08240816ed1c4e2c73306ab1a851bf80df1892b5e2f92064a49fbadc1f4c75043625ace77dd25b64d5d1c2a7d1d61cc916fba0b ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -28,12 +27,12 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DZMQ_BUILD_TESTS=OFF - -DPOLLER=select -DBUILD_STATIC=${BUILD_STATIC} -DBUILD_SHARED=${BUILD_SHARED} -DWITH_PERF_TOOL=OFF -DWITH_DOCS=OFF -DWITH_NSS=OFF + -DWITH_LIBSODIUM_STATIC=${BUILD_STATIC} ${FEATURE_OPTIONS} ${PLATFORM_OPTIONS} OPTIONS_DEBUG @@ -47,8 +46,8 @@ vcpkg_copy_pdbs() if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/share/cmake/ZeroMQ) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/ZeroMQ) +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ZeroMQ) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ZeroMQ) endif() file(COPY @@ -57,13 +56,6 @@ file(COPY ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/zmq.h - "defined ZMQ_STATIC" - "1 //defined ZMQ_STATIC" - ) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() diff --git a/versions/baseline.json b/versions/baseline.json index af3884ddb..d379b86a6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6609,8 +6609,8 @@ "port-version": 0 }, "zeromq": { - "baseline": "2019-09-20", - "port-version": 2 + "baseline": "4.3.4", + "port-version": 0 }, "zfp": { "baseline": "0.5.5-2", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index b71eb71f6..28696a10d 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "baf0f8a38476e24bbe2b3f4cac31ed02fff29bc4", + "version-string": "4.3.4", + "port-version": 0 + }, + { "git-tree": "8b2b16bcbcdd4854b2bebbafb27fc9c511ad4c07", "version-string": "2019-09-20", "port-version": 2 |