From df92e33bd887a6c2d45900a02fe116c9ece408b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3n=20Bjarni?= Date: Mon, 24 Apr 2023 22:46:46 +0000 Subject: [PATCH] [zeromq] prevent using hosts libbsd when cross compiling (#31007) * zeromq prevent using hosts libbsd when cross compiling * update port version * remove unwanted change * add version * Disable libbsd entirely to prevent mismatch between zeromq artifacts for shared/static objects * update git tree hash --- ports/zeromq/portfile.cmake | 1 + ports/zeromq/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/zeromq.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 891449d991..c5f4a99d11 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -35,6 +35,7 @@ vcpkg_cmake_configure( -DWITH_DOCS=OFF -DWITH_NSS=OFF -DCMAKE_FIND_PACKAGE_REQUIRE_GnuTLS=ON + -DWITH_LIBBSD=OFF -DWITH_LIBSODIUM_STATIC=${BUILD_STATIC} ${FEATURE_OPTIONS} ${PLATFORM_OPTIONS} diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index 70e2c48c23..87e5ec27d5 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zeromq", "version-date": "2023-01-31", - "port-version": 1, + "port-version": 2, "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", "license": "LGPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 047b16ec9c..93ee765b4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8734,7 +8734,7 @@ }, "zeromq": { "baseline": "2023-01-31", - "port-version": 1 + "port-version": 2 }, "zfp": { "baseline": "1.0.0", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index db3d4a2d40..d07677e942 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3926aa389f1ff91b3895fd51c502600effe6c4f2", + "version-date": "2023-01-31", + "port-version": 2 + }, { "git-tree": "faad6e9fea08c6740bc27652b7d3df33ee693a41", "version-date": "2023-01-31",