[pick](branch-2.1) pick #41891 (#41929)

pick #41891
apache · Oct 16, 2024 · 95d429b · 95d429b
1 parent e6545a3
commit 95d429b
Show file tree

Hide file tree

Showing 2 changed files with 421 additions and 1 deletion.
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
@@ -394,7 +394,8 @@ if [[ "${BRPC_SOURCE}" == 'brpc-1.4.0' ]]; then
     cd "${TP_SOURCE_DIR}/${BRPC_SOURCE}"
     if [[ ! -f "${PATCHED_MARK}" ]]; then
         for patch_file in "${TP_PATCH_DIR}"/brpc-*; do
-            patch -p1 <"${patch_file}"
+            echo "patch ${patch_file}"
+            patch -p1 --ignore-whitespace <"${patch_file}"
         done
         touch "${PATCHED_MARK}"
     fi