Skip to content

Commit

Permalink
Only use forked vcpkg for macOS build
Browse files Browse the repository at this point in the history
  • Loading branch information
BewareMyPower committed Dec 17, 2024
1 parent 8e3eb8d commit 92bb395
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "vcpkg"]
path = vcpkg
url = https://github.com/bewaremypower/vcpkg.git
url = https://github.com/microsoft/vcpkg.git
5 changes: 5 additions & 0 deletions pkg/mac/build-static-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ else
exit 1
fi

# Use a forked version of vcpkg to support building libcurl with IPv6 disabled
rm -rf vcpkg
git clone https://github.com/BewareMyPower/vcpkg.git -b curl-8.4.0-osx-patch
git apply vcpkg-osx-json.diff

INSTALL_DIR=$PWD/pkg/mac/.install
set -x
cmake -B build-osx \
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Submodule vcpkg updated 1099 files
22 changes: 22 additions & 0 deletions vcpkg-osx-json.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/vcpkg.json b/vcpkg.json
index 5ff4410..e117563 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": "b03173a5d0cbd2f7c3c5e85a576e98fba3560835",
"dependencies": [
{
"name": "asio",
@@ -25,7 +25,7 @@
"features": [
"openssl"
],
- "version>=": "8.4.0"
+ "version>=": "8.4.0#1"
},
{
"name": "dlfcn-win32",
4 changes: 2 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "pulsar-cpp",
"version": "3.5.0",
"description": "Pulsar C++ SDK",
"builtin-baseline": "b03173a5d0cbd2f7c3c5e85a576e98fba3560835",
"builtin-baseline": "b051745c68faa6f65c493371d564c4eb8af34dad",
"dependencies": [
{
"name": "asio",
Expand All @@ -25,7 +25,7 @@
"features": [
"openssl"
],
"version>=": "8.4.0#1"
"version>=": "8.4.0"
},
{
"name": "dlfcn-win32",
Expand Down

0 comments on commit 92bb395

Please sign in to comment.