This is an automated email from the ASF dual-hosted git repository.

dataroaring 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 e1f119b5a22 [Fix](third-party) Fix missing patching jemalloc when 
build third-party introduced by ##34385 (#34448)
e1f119b5a22 is described below

commit e1f119b5a2297de539e928e611a2253b269d65b7
Author: Gavin Chou <gavineaglec...@gmail.com>
AuthorDate: Wed May 8 09:44:51 2024 +0800

    [Fix](third-party) Fix missing patching jemalloc when build third-party 
introduced by ##34385 (#34448)
---
 thirdparty/build-thirdparty.sh    | 4 ++--
 thirdparty/download-thirdparty.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 6c9e3b5128a..6ce0c98e1a1 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -1494,7 +1494,7 @@ build_hdfs3() {
 }
 
 # jemalloc
-build_jemalloc() {
+build_jemalloc_doris() {
     check_if_source_exist "${JEMALLOC_DORIS_SOURCE}"
     cd "${TP_SOURCE_DIR}/${JEMALLOC_DORIS_SOURCE}"
 
@@ -1818,7 +1818,7 @@ if [[ "${#packages[@]}" -eq 0 ]]; then
         thrift
         leveldb
         brpc
-        jemalloc
+        jemalloc_doris
         rocksdb
         krb5 # before cyrus_sasl
         cyrus_sasl
diff --git a/thirdparty/download-thirdparty.sh 
b/thirdparty/download-thirdparty.sh
index ebbb8422ecb..4a3d8d5a623 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -386,7 +386,7 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " LIBRDKAFKA " ]]; then
 fi
 
 # patch jemalloc, disable JEMALLOC_MANGLE for overloading the memory API.
-if [[ " ${TP_ARCHIVES[*]} " =~ " JEMALLOC " ]]; then
+if [[ " ${TP_ARCHIVES[*]} " =~ " JEMALLOC_DORIS " ]]; then
     if [[ "${JEMALLOC_DORIS_SOURCE}" = "jemalloc-5.3.0" ]]; then
         cd "${TP_SOURCE_DIR}/${JEMALLOC_DORIS_SOURCE}"
         if [[ ! -f "${PATCHED_MARK}" ]]; then


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to