Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/build-thirdparty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ jobs:
export PATH="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 1 -type d -name 'bin'):${PATH}"
export JAVA_HOME="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 0)"
export DORIS_TOOLCHAIN=gcc
export CMAKE_POLICY_VERSION_MINIMUM=3.10
export CUSTOM_CMAKE="/usr/local/bin/cmake"

cd thirdparty
./build-thirdparty.sh -j "$(nproc)"
Expand Down Expand Up @@ -190,6 +192,8 @@ jobs:
- name: Build
run: |
export MACOSX_DEPLOYMENT_TARGET=12.0
export CMAKE_POLICY_VERSION_MINIMUM=3.10
export CUSTOM_CMAKE="/usr/local/bin/cmake"

cd thirdparty
./build-thirdparty.sh -j "$(nproc)"
Expand Down Expand Up @@ -248,6 +252,8 @@ jobs:
- name: Build
run: |
export MACOSX_DEPLOYMENT_TARGET=12.0
export CMAKE_POLICY_VERSION_MINIMUM=3.10
export CUSTOM_CMAKE="/usr/local/bin/cmake"

cd thirdparty
./build-thirdparty.sh -j "$(nproc)"
Expand Down
2 changes: 1 addition & 1 deletion be/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ add_executable(doris_be_test ${UT_FILES})
target_link_libraries(doris_be_test ${TEST_LINK_LIBS}
-Wl,--whole-archive vector_search_test -Wl,--no-whole-archive)
set_target_properties(doris_be_test PROPERTIES COMPILE_FLAGS "-fno-access-control")

target_compile_options(doris_be_test PRIVATE -include gtest/gtest.h)
if (OS_MACOSX AND ARCH_ARM)
find_program(DSYMUTIL NAMES dsymutil)
message(STATUS "dsymutil found: ${DSYMUTIL}")
Expand Down
7 changes: 7 additions & 0 deletions thirdparty/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

This file contains version of the third-party dependency libraries in the build-env image. The docker build-env image is apache/doris, and the tag is `build-env-${version}`

## 20251021

- Modified: gtest 1.11.0 -> 1.12.1
- Modified: zstd 1.5.5 -> 1.5.7
- Modified: cctz 2.3 -> 2.5
- Added: hadoop-libs 3.4.2.1

## 20250720

- Modified: zlib 1.2.11 -> 1.3.1
Expand Down
120 changes: 88 additions & 32 deletions thirdparty/build-thirdparty.sh

Large diffs are not rendered by default.

24 changes: 0 additions & 24 deletions thirdparty/download-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -267,17 +267,6 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " GLOG " ]]; then
echo "Finished patching ${GLOG_SOURCE}"
fi

# gtest patch
if [[ " ${TP_ARCHIVES[*]} " =~ " GTEST " ]]; then
cd "${TP_SOURCE_DIR}/${GTEST_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
patch -p1 <"${TP_PATCH_DIR}/googletest-release-1.11.0.patch"
touch "${PATCHED_MARK}"
fi
cd -
echo "Finished patching ${GTEST_SOURCE}"
fi

# mysql patch
if [[ " ${TP_ARCHIVES[*]} " =~ " MYSQL " ]]; then
cd "${TP_SOURCE_DIR}/${MYSQL_SOURCE}"
Expand All @@ -289,19 +278,6 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " MYSQL " ]]; then
echo "Finished patching ${MYSQL_SOURCE}"
fi

# libevent patch
if [[ " ${TP_ARCHIVES[*]} " =~ " LIBEVENT " ]]; then
cd "${TP_SOURCE_DIR}/${LIBEVENT_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
patch -p1 <"${TP_PATCH_DIR}/libevent.patch"
patch -p1 <"${TP_PATCH_DIR}/libevent-1532.patch"
patch -p1 <"${TP_PATCH_DIR}/libevent-keepalive-accepted-socket.patch"
touch "${PATCHED_MARK}"
fi
cd -
echo "Finished patching ${LIBEVENT_SOURCE}"
fi

# gsasl2 patch to fix link error such as mutilple func defination
# when link target with kerberos
if [[ " ${TP_ARCHIVES[*]} " =~ " GSASL " ]]; then
Expand Down
71 changes: 0 additions & 71 deletions thirdparty/patches/googletest-release-1.11.0.patch

This file was deleted.

188 changes: 0 additions & 188 deletions thirdparty/patches/libevent-1532.patch

This file was deleted.

17 changes: 0 additions & 17 deletions thirdparty/patches/libevent-keepalive-accepted-socket.patch

This file was deleted.

Loading
Loading