This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 5c6a56b159c [fix](third-party) Fix the build of protobuf (#46978)
5c6a56b159c is described below
commit 5c6a56b159cb11c1d7ed309ed0e61572fcba4231
Author: Adonis Ling <adonis0...@gmail.com>
AuthorDate: Tue Jan 14 18:59:40 2025 +0800
[fix](third-party) Fix the build of protobuf (#46978)
Backport #31173
---
.github/workflows/build-thirdparty.yml | 60 +++++++++++++++++++++++++++++++---
thirdparty/build-thirdparty.sh | 2 +-
2 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build-thirdparty.yml
b/.github/workflows/build-thirdparty.yml
index cf3837185cc..991b5089035 100644
--- a/.github/workflows/build-thirdparty.yml
+++ b/.github/workflows/build-thirdparty.yml
@@ -32,7 +32,7 @@ jobs:
thirdparty_changes: ${{ steps.filter.outputs.thirdparty_changes }}
steps:
- name: Checkout ${{ github.ref }}
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
submodules: recursive
@@ -67,7 +67,7 @@ jobs:
remove-docker-images: 'true'
- name: Checkout ${{ github.ref }}
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Download
run: |
@@ -129,10 +129,10 @@ jobs:
name: Build Third Party Libraries (macOS)
needs: changes
if: ${{ needs.changes.outputs.thirdparty_changes == 'true' }}
- runs-on: macos-12
+ runs-on: macos-13
steps:
- name: Checkout ${{ github.ref }}
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Download
run: |
@@ -144,6 +144,58 @@ jobs:
- name: Prepare
run: |
packages=(
+ 'm4'
+ 'automake'
+ 'autoconf'
+ 'libtool'
+ 'pkg-config'
+ 'texinfo'
+ 'coreutils'
+ 'gnu-getopt'
+ 'python@3'
+ 'cmake'
+ 'ninja'
+ 'ccache'
+ 'bison'
+ 'byacc'
+ 'gettext'
+ 'wget'
+ 'pcre'
+ 'openjdk@11'
+ 'maven'
+ 'node'
+ 'llvm@16'
+ )
+
+ brew install "${packages[@]}" || true
+
+ - name: Build
+ run: |
+ export MACOSX_DEPLOYMENT_TARGET=12.0
+
+ cd thirdparty
+ ./build-thirdparty.sh -j "$(nproc)"
+
+ build_macos_arm64:
+ name: Build Third Party Libraries (macOS-arm64)
+ needs: changes
+ if: ${{ needs.changes.outputs.thirdparty_changes == 'true' }}
+ runs-on: macos-14
+ steps:
+ - name: Checkout ${{ github.ref }}
+ uses: actions/checkout@v4
+
+ - name: Download
+ run: |
+ cd thirdparty
+ curl -L
https://github.com/apache/doris-thirdparty/releases/download/automation/doris-thirdparty-source.tgz
\
+ -o doris-thirdparty-source.tgz
+ tar -zxvf doris-thirdparty-source.tgz
+
+ - name: Prepare
+ run: |
+ packages=(
+ 'm4'
'automake'
'autoconf'
'libtool'
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index ed75aaefe73..806145ee40a 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
