Skip to content

Commit 9ed491c

Browse files
committed
Switch to bewaremypower/vcpkg to build curl without frameworks linked
1 parent 382c9d9 commit 9ed491c

File tree

6 files changed

+14
-82
lines changed

6 files changed

+14
-82
lines changed

.github/workflows/ci-pr-validation.yaml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,21 @@ jobs:
4646
fetch-depth: 0
4747
submodules: recursive
4848

49-
- name: Apply the patch for vcpkg
50-
run: ./build-support/apply-vcpkg-macos-curl-patch.sh
51-
5249
- name: Install dependencies
5350
run: |
5451
export ARCH=${{ matrix.arch }}
5552
./pkg/mac/build-static-library.sh
5653
54+
- name: Test static libraries
55+
run: |
56+
export PULSAR_DIR=$PWD/pkg/mac/.install
57+
echo "Build with dynamic library"
58+
clang++ win-examples/example.cc -o dynamic.out -std=c++11 -arch ${{ matrix.arch }} -I $PULSAR_DIR/include -L $PULSAR_DIR/lib -Wl,-rpath $PULSAR_DIR/lib -lpulsar
59+
./dynamic.out
60+
echo "Build with static library"
61+
clang++ win-examples/example.cc -o static.out -std=c++11 -arch ${{ matrix.arch }} -I $PULSAR_DIR/include $PULSAR_DIR/lib/libpulsarwithdeps.a
62+
./static.out
63+
5764
- name: Zip artifact
5865
run: |
5966
cd ./pkg/mac/.install
@@ -66,16 +73,6 @@ jobs:
6673
name: macos-${{ matrix.arch }}.zip
6774
path: macos-${{ matrix.arch }}.zip
6875

69-
- name: Test static libraries
70-
run: |
71-
export PULSAR_DIR=$PWD/pkg/mac/.install
72-
echo "Build with dynamic library"
73-
clang++ win-examples/example.cc -o dynamic.out -std=c++11 -arch ${{ matrix.arch }} -I $PULSAR_DIR/include -L $PULSAR_DIR/lib -Wl,-rpath $PULSAR_DIR/lib -lpulsar
74-
./dynamic.out
75-
echo "Build with static library"
76-
clang++ win-examples/example.cc -o static.out -std=c++11 -arch ${{ matrix.arch }} -I $PULSAR_DIR/include $PULSAR_DIR/lib/libpulsarwithdeps.a
77-
./static.out
78-
7976
check-completion:
8077
name: Check Completion
8178
runs-on: ubuntu-latest

.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/microsoft/vcpkg.git
3+
url = https://github.com/bewaremypower/vcpkg.git

build-support/apply-vcpkg-macos-curl-patch.sh

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

build-support/vcpkg-curl-patch.diff

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

vcpkg

Submodule vcpkg updated 1099 files

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": "b051745c68faa6f65c493371d564c4eb8af34dad",
5+
"builtin-baseline": "b03173a5d0cbd2f7c3c5e85a576e98fba3560835",
66
"dependencies": [
77
{
88
"name": "asio",
@@ -25,7 +25,7 @@
2525
"features": [
2626
"openssl"
2727
],
28-
"version>=": "8.4.0"
28+
"version>=": "8.4.0#1"
2929
},
3030
{
3131
"name": "dlfcn-win32",

0 commit comments

Comments
 (0)