Skip to content

Commit c0b0546

Browse files
branch-4.0: [feat](deps) add hadoop 3.4.2 #57181 #57359 (#57577)
Cherry-picked from #57181 #57359 --------- Co-authored-by: Mingyu Chen (Rayner) <[email protected]>
1 parent b176cda commit c0b0546

File tree

10 files changed

+125
-542
lines changed

10 files changed

+125
-542
lines changed

.github/workflows/build-thirdparty.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ jobs:
132132
export PATH="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 1 -type d -name 'bin'):${PATH}"
133133
export JAVA_HOME="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 0)"
134134
export DORIS_TOOLCHAIN=gcc
135+
export CMAKE_POLICY_VERSION_MINIMUM=3.10
136+
export CUSTOM_CMAKE="/usr/local/bin/cmake"
135137
136138
cd thirdparty
137139
./build-thirdparty.sh -j "$(nproc)"
@@ -190,6 +192,8 @@ jobs:
190192
- name: Build
191193
run: |
192194
export MACOSX_DEPLOYMENT_TARGET=12.0
195+
export CMAKE_POLICY_VERSION_MINIMUM=3.10
196+
export CUSTOM_CMAKE="/usr/local/bin/cmake"
193197
194198
cd thirdparty
195199
./build-thirdparty.sh -j "$(nproc)"
@@ -248,6 +252,8 @@ jobs:
248252
- name: Build
249253
run: |
250254
export MACOSX_DEPLOYMENT_TARGET=12.0
255+
export CMAKE_POLICY_VERSION_MINIMUM=3.10
256+
export CUSTOM_CMAKE="/usr/local/bin/cmake"
251257
252258
cd thirdparty
253259
./build-thirdparty.sh -j "$(nproc)"

be/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ add_executable(doris_be_test ${UT_FILES})
113113
target_link_libraries(doris_be_test ${TEST_LINK_LIBS}
114114
-Wl,--whole-archive vector_search_test -Wl,--no-whole-archive)
115115
set_target_properties(doris_be_test PROPERTIES COMPILE_FLAGS "-fno-access-control")
116-
116+
target_compile_options(doris_be_test PRIVATE -include gtest/gtest.h)
117117
if (OS_MACOSX AND ARCH_ARM)
118118
find_program(DSYMUTIL NAMES dsymutil)
119119
message(STATUS "dsymutil found: ${DSYMUTIL}")

thirdparty/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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}`
44

5+
## 20251021
6+
7+
- Modified: gtest 1.11.0 -> 1.12.1
8+
- Modified: zstd 1.5.5 -> 1.5.7
9+
- Modified: cctz 2.3 -> 2.5
10+
- Added: hadoop-libs 3.4.2.1
11+
512
## 20250720
613

714
- Modified: zlib 1.2.11 -> 1.3.1

thirdparty/build-thirdparty.sh

Lines changed: 88 additions & 32 deletions
Large diffs are not rendered by default.

thirdparty/download-thirdparty.sh

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,6 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " GLOG " ]]; then
267267
echo "Finished patching ${GLOG_SOURCE}"
268268
fi
269269

270-
# gtest patch
271-
if [[ " ${TP_ARCHIVES[*]} " =~ " GTEST " ]]; then
272-
cd "${TP_SOURCE_DIR}/${GTEST_SOURCE}"
273-
if [[ ! -f "${PATCHED_MARK}" ]]; then
274-
patch -p1 <"${TP_PATCH_DIR}/googletest-release-1.11.0.patch"
275-
touch "${PATCHED_MARK}"
276-
fi
277-
cd -
278-
echo "Finished patching ${GTEST_SOURCE}"
279-
fi
280-
281270
# mysql patch
282271
if [[ " ${TP_ARCHIVES[*]} " =~ " MYSQL " ]]; then
283272
cd "${TP_SOURCE_DIR}/${MYSQL_SOURCE}"
@@ -289,19 +278,6 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " MYSQL " ]]; then
289278
echo "Finished patching ${MYSQL_SOURCE}"
290279
fi
291280

292-
# libevent patch
293-
if [[ " ${TP_ARCHIVES[*]} " =~ " LIBEVENT " ]]; then
294-
cd "${TP_SOURCE_DIR}/${LIBEVENT_SOURCE}"
295-
if [[ ! -f "${PATCHED_MARK}" ]]; then
296-
patch -p1 <"${TP_PATCH_DIR}/libevent.patch"
297-
patch -p1 <"${TP_PATCH_DIR}/libevent-1532.patch"
298-
patch -p1 <"${TP_PATCH_DIR}/libevent-keepalive-accepted-socket.patch"
299-
touch "${PATCHED_MARK}"
300-
fi
301-
cd -
302-
echo "Finished patching ${LIBEVENT_SOURCE}"
303-
fi
304-
305281
# gsasl2 patch to fix link error such as mutilple func defination
306282
# when link target with kerberos
307283
if [[ " ${TP_ARCHIVES[*]} " =~ " GSASL " ]]; then

thirdparty/patches/googletest-release-1.11.0.patch

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

thirdparty/patches/libevent-1532.patch

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

thirdparty/patches/libevent-keepalive-accepted-socket.patch

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

0 commit comments

Comments
 (0)