Skip to content

Commit 92bb395

Browse files
committed
Only use forked vcpkg for macOS build
1 parent 8e3eb8d commit 92bb395

File tree

5 files changed

+31
-4
lines changed

5 files changed

+31
-4
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "vcpkg"]
22
path = vcpkg
3-
url = https://github.com/bewaremypower/vcpkg.git
3+
url = https://github.com/microsoft/vcpkg.git

pkg/mac/build-static-library.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ else
3434
exit 1
3535
fi
3636

37+
# Use a forked version of vcpkg to support building libcurl with IPv6 disabled
38+
rm -rf vcpkg
39+
git clone https://github.com/BewareMyPower/vcpkg.git -b curl-8.4.0-osx-patch
40+
git apply vcpkg-osx-json.diff
41+
3742
INSTALL_DIR=$PWD/pkg/mac/.install
3843
set -x
3944
cmake -B build-osx \

vcpkg

Submodule vcpkg updated 1099 files

vcpkg-osx-json.diff

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/vcpkg.json b/vcpkg.json
2+
index 5ff4410..e117563 100644
3+
--- a/vcpkg.json
4+
+++ b/vcpkg.json
5+
@@ -2,7 +2,7 @@
6+
"name": "pulsar-cpp",
7+
"version": "3.5.0",
8+
"description": "Pulsar C++ SDK",
9+
- "builtin-baseline": "b051745c68faa6f65c493371d564c4eb8af34dad",
10+
+ "builtin-baseline": "b03173a5d0cbd2f7c3c5e85a576e98fba3560835",
11+
"dependencies": [
12+
{
13+
"name": "asio",
14+
@@ -25,7 +25,7 @@
15+
"features": [
16+
"openssl"
17+
],
18+
- "version>=": "8.4.0"
19+
+ "version>=": "8.4.0#1"
20+
},
21+
{
22+
"name": "dlfcn-win32",

vcpkg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "pulsar-cpp",
33
"version": "3.5.0",
44
"description": "Pulsar C++ SDK",
5-
"builtin-baseline": "b03173a5d0cbd2f7c3c5e85a576e98fba3560835",
5+
"builtin-baseline": "b051745c68faa6f65c493371d564c4eb8af34dad",
66
"dependencies": [
77
{
88
"name": "asio",
@@ -25,7 +25,7 @@
2525
"features": [
2626
"openssl"
2727
],
28-
"version>=": "8.4.0#1"
28+
"version>=": "8.4.0"
2929
},
3030
{
3131
"name": "dlfcn-win32",

0 commit comments

Comments
 (0)