From afa53f1c6d5d7cf10224d5f447072e6a91dae89f Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Tue, 17 Dec 2024 18:21:03 +0800 Subject: [PATCH] Disable IPv6 when building curl --- pkg/mac/build-static-library.sh | 6 ------ vcpkg | 2 +- vcpkg.json | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkg/mac/build-static-library.sh b/pkg/mac/build-static-library.sh index abb9e9a6..ed450571 100755 --- a/pkg/mac/build-static-library.sh +++ b/pkg/mac/build-static-library.sh @@ -34,12 +34,6 @@ else exit 1 fi -# Apply the patch to disable IPv6 when building curl, otherwise curl will depend on some -# frameworks (CoreFoundation, CoreServices, SystemConfiguration) that cannot be bundled -# into the static library `libpulsarwithdeps.a`. -# It requires the extra link options like `-framework CoreFoundation -framework CoreServices -framework SystemConfiguration`. -sed -i.bak 's/set(OPTIONS "")/set(OPTIONS -DENABLE_IPV6=OFF)/' vcpkg/ports/curl/portfile.cmake - INSTALL_DIR=$PWD/pkg/mac/.install set -x cmake -B build-osx \ diff --git a/vcpkg b/vcpkg index 97dd2672..a1acae54 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 97dd26728e3856ed1ab62ee74ee3a391d9c81d19 +Subproject commit a1acae54be24d4e6eb5050c158be800ff1e8e14e diff --git a/vcpkg.json b/vcpkg.json index 5ff44100..e2636317 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,7 +2,7 @@ "name": "pulsar-cpp", "version": "3.5.0", "description": "Pulsar C++ SDK", - "builtin-baseline": "b051745c68faa6f65c493371d564c4eb8af34dad", + "builtin-baseline": "a1acae54be24d4e6eb5050c158be800ff1e8e14e", "dependencies": [ { "name": "asio", @@ -25,7 +25,7 @@ "features": [ "openssl" ], - "version>=": "8.4.0" + "version>=": "8.5.0#2" }, { "name": "dlfcn-win32",