Skip to content

Commit acc923e

Browse files
committed
remove curl patch for vcpkg and link to apple frameworks
1 parent 7277b03 commit acc923e

2 files changed

Lines changed: 2 additions & 45 deletions

File tree

pkg/mac/build-static-library.sh

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

37-
# Apply the patch to support building libcurl with IPv6 disabled
38-
COMMIT_ID=$(grep "builtin-baseline" vcpkg.json | sed 's/"//g' | sed 's/,//' | awk '{print $2}')
39-
cd vcpkg
40-
git reset --hard $COMMIT_ID
41-
git apply ../pkg/mac/vcpkg-curl-patch.diff
42-
git add ports/curl
43-
git commit -m "Disable IPv6 for macOS in curl"
44-
./bootstrap-vcpkg.sh
45-
./vcpkg x-add-version --all
46-
git add versions/
47-
git commit -m "Update version"
48-
COMMIT_ID=$(git log --pretty=oneline | head -n 1 | awk '{print $1}')
49-
cd ..
50-
sed -i.bak "s/.*builtin-baseline.*/ \"builtin-baseline\": \"$COMMIT_ID\",/" vcpkg.json
51-
sed -i.bak "s/\"version>=\": \"8\.13\.0#1\"/\"version>=\": \"8.13.0#2\"/" vcpkg.json
52-
5337
INSTALL_DIR=$PWD/pkg/mac/.install
5438
set -x
5539
cmake -B build-osx \
@@ -72,5 +56,6 @@ cp ./build-osx/libpulsarwithdeps.a $INSTALL_DIR/lib/
7256
# Test the libraries
7357
clang++ win-examples/example.cc -o dynamic.out -std=c++17 -arch $ARCH -I $INSTALL_DIR/include -L $INSTALL_DIR/lib -Wl,-rpath $INSTALL_DIR/lib -lpulsar
7458
./dynamic.out
75-
clang++ win-examples/example.cc -o static.out -std=c++17 -arch $ARCH -I $INSTALL_DIR/include $INSTALL_DIR/lib/libpulsarwithdeps.a
59+
clang++ win-examples/example.cc -o static.out -std=c++17 -arch $ARCH -I $INSTALL_DIR/include $INSTALL_DIR/lib/libpulsarwithdeps.a \
60+
-framework CoreFoundation -framework SystemConfiguration
7661
./static.out

pkg/mac/vcpkg-curl-patch.diff

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)