This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 89d3e795ebd [chore](third-party) Link protobuf with zlib statically
(#31173)
89d3e795ebd is described below
commit 89d3e795ebd23f6bd36212b5e0f6b9146eb5df1c
Author: Adonis Ling <adonis0...@gmail.com>
AuthorDate: Wed Feb 21 11:00:24 2024 +0800
[chore](third-party) Link protobuf with zlib statically (#31173)
We should link protobuf with libz.a explicitly, otherwise protoc may not be
executable due to the missing libz.1.dylib.
---
.github/workflows/build-thirdparty.yml | 4 +++-
thirdparty/build-thirdparty.sh | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build-thirdparty.yml
b/.github/workflows/build-thirdparty.yml
index 978bed3a513..cf3837185cc 100644
--- a/.github/workflows/build-thirdparty.yml
+++ b/.github/workflows/build-thirdparty.yml
@@ -166,10 +166,12 @@ jobs:
'llvm@16'
)
- brew install "${packages[@]}"
+ brew install "${packages[@]}" || true
- name: Build
run: |
+ export MACOSX_DEPLOYMENT_TARGET=12.0
+
cd thirdparty
./build-thirdparty.sh -j "$(nproc)"
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 624e2cbe0d2..4fd4b773007 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -434,7 +434,7 @@ build_protobuf() {
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-Dprotobuf_BUILD_SHARED_LIBS=OFF \
-Dprotobuf_BUILD_TESTS=OFF \
- -Dprotobuf_WITH_ZLIB_DEFAULT=ON \
+ -DZLIB_LIBRARY="${TP_LIB_DIR}/libz.a" \
-Dprotobuf_ABSL_PROVIDER=package \
-DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" ../..
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
