diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md index 1cb2e96a53b8c8..8c049ea51bb3a7 100644 --- a/thirdparty/CHANGELOG.md +++ b/thirdparty/CHANGELOG.md @@ -2,6 +2,10 @@ 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}` +## 20260816 + +- Modified: hadoop-libs 3.4.2.3 -> 3.4.2.4 + ## 20260814 - Modified: hadoop-libs 3.4.2.2 -> 3.4.2.3 diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index f44122ca1f3f88..6f0676e565a33f 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -2372,6 +2372,10 @@ if [[ "${#packages[@]}" -eq 0 ]]; then ) if [[ "$(uname -s)" == 'Darwin' ]]; then read -r -a packages <<<"binutils gettext ${packages[*]}" + # hadoop_libs, the 3.3.6 fork, stays Linux-only: it carries none of the macOS fixes + # apache/doris-thirdparty#407 made to the 3.4 fork, and nothing built here reads its + # hadoop_hdfs/ prefix - the cloud module, its only other consumer, is Linux-only too. + read -r -a packages <<<"${packages[*]} hadoop_libs_3_4" elif [[ "$(uname -s)" == 'Linux' ]]; then read -r -a packages <<<"${packages[*]} hadoop_libs" read -r -a packages <<<"${packages[*]} hadoop_libs_3_4" diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index 211954c27a87c2..6a42bd00cf7963 100644 --- a/thirdparty/vars.sh +++ b/thirdparty/vars.sh @@ -504,10 +504,10 @@ HADOOP_LIBS_SOURCE="doris-thirdparty-hadoop-3.3.6.6-for-doris" HADOOP_LIBS_MD5SUM="13b66d5f2abffd1740e692b65df5962e" # libhdfs 3.4 -HADOOP_LIBS_3_4_DOWNLOAD="https://github.com/apache/doris-thirdparty/archive/refs/tags/hadoop-3.4.2.3-for-doris.tar.gz" -HADOOP_LIBS_3_4_NAME="hadoop-3.4.2.3-for-doris.tar.gz" -HADOOP_LIBS_3_4_SOURCE="doris-thirdparty-hadoop-3.4.2.3-for-doris" -HADOOP_LIBS_3_4_MD5SUM="a751a42f3a927c4a272a99d4e3788648" +HADOOP_LIBS_3_4_DOWNLOAD="https://github.com/apache/doris-thirdparty/archive/refs/tags/hadoop-3.4.2.4-for-doris.tar.gz" +HADOOP_LIBS_3_4_NAME="hadoop-3.4.2.4-for-doris.tar.gz" +HADOOP_LIBS_3_4_SOURCE="doris-thirdparty-hadoop-3.4.2.4-for-doris" +HADOOP_LIBS_3_4_MD5SUM="729a7ef9126f65255d1da124a88ffd50" # AvxToNeon AVX2NEON_DOWNLOAD="https://github.com/kunpengcompute/AvxToNeon/archive/refs/tags/v1.0.0.tar.gz"