This is an automated email from the ASF dual-hosted git repository.
adonisling 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 f6f1e3b6463 [chore](build) Bump the version of hyperscan (#25464)
f6f1e3b6463 is described below
commit f6f1e3b6463f4a4d67de6ab42ff96f065dcdac45
Author: Adonis Ling <adonis0...@gmail.com>
AuthorDate: Tue Oct 17 08:45:25 2023 -0500
[chore](build) Bump the version of hyperscan (#25464)
The latest version fixed the previous issue
(https://github.com/intel/hyperscan/issues/292).
---
thirdparty/download-thirdparty.sh | 9 +--------
thirdparty/patches/hyperscan-5.4.0.patch | 18 ------------------
thirdparty/vars.sh | 8 ++++----
3 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/thirdparty/download-thirdparty.sh
b/thirdparty/download-thirdparty.sh
index e1d7c328656..2bb396b24b6 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -367,14 +367,7 @@ echo "Finished patching ${JEMALLOC_DORIS_SOURCE}"
# patch hyperscan
# https://github.com/intel/hyperscan/issues/292
-if [[ "${HYPERSCAN_SOURCE}" == "hyperscan-5.4.0" ]]; then
- cd "${TP_SOURCE_DIR}/${HYPERSCAN_SOURCE}"
- if [[ ! -f "${PATCHED_MARK}" ]]; then
- patch -p0 <"${TP_PATCH_DIR}/hyperscan-5.4.0.patch"
- touch "${PATCHED_MARK}"
- fi
- cd -
-elif [[ "${HYPERSCAN_SOURCE}" == "vectorscan-vectorscan-5.4.7" ]]; then
+if [[ "${HYPERSCAN_SOURCE}" == "vectorscan-vectorscan-5.4.7" ]]; then
cd "${TP_SOURCE_DIR}/${HYPERSCAN_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
patch -p0 <"${TP_PATCH_DIR}/vectorscan-5.4.7.patch"
diff --git a/thirdparty/patches/hyperscan-5.4.0.patch
b/thirdparty/patches/hyperscan-5.4.0.patch
deleted file mode 100644
index 8bce7a88baf..00000000000
--- a/thirdparty/patches/hyperscan-5.4.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git cmake/build_wrapper.sh cmake/build_wrapper.sh
-index 1962813..becfbf4 100755
---- cmake/build_wrapper.sh
-+++ cmake/build_wrapper.sh
-@@ -17,11 +17,11 @@ KEEPSYMS=$(mktemp -p /tmp keep.syms.XXXXX)
- LIBC_SO=$("$@" --print-file-name=libc.so.6)
- cp ${KEEPSYMS_IN} ${KEEPSYMS}
- # get all symbols from libc and turn them into patterns
--nm -f p -g -D ${LIBC_SO} | sed -s 's/\([^ ]*\).*/^\1$/' >> ${KEEPSYMS}
-+nm -f posix -g -D ${LIBC_SO} | sed -s 's/\([^ @]*\).*/^\1$/' >> ${KEEPSYMS}
- # build the object
- "$@"
- # rename the symbols in the object
--nm -f p -g ${OUT} | cut -f1 -d' ' | grep -v -f ${KEEPSYMS} | sed -e
"s/\(.*\)/\1\ ${PREFIX}_\1/" >> ${SYMSFILE}
-+nm -f posix -g ${OUT} | cut -f1 -d' ' | grep -v -f ${KEEPSYMS} | sed -e
"s/\(.*\)/\1\ ${PREFIX}_\1/" >> ${SYMSFILE}
- if test -s ${SYMSFILE}
- then
- objcopy --redefine-syms=${SYMSFILE} ${OUT}
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index e154a1b3420..f12b763ca34 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -152,10 +152,10 @@ RE2_SOURCE=re2-2021-02-02
RE2_MD5SUM="48bc665463a86f68243c5af1bac75cd0"
# hyperscan
-HYPERSCAN_DOWNLOAD="https://github.com/intel/hyperscan/archive/refs/tags/v5.4.0.tar.gz";
-HYPERSCAN_NAME=hyperscan-5.4.0.tar.gz
-HYPERSCAN_SOURCE=hyperscan-5.4.0
-HYPERSCAN_MD5SUM="65e08385038c24470a248f6ff2fa379b"
+HYPERSCAN_DOWNLOAD="https://github.com/intel/hyperscan/archive/refs/tags/v5.4.2.tar.gz";
+HYPERSCAN_NAME=hyperscan-5.4.2.tar.gz
+HYPERSCAN_SOURCE=hyperscan-5.4.2
+HYPERSCAN_MD5SUM="202f4b42f5dd4a7bb2506445e51a33b9"
# vectorscan (support arm for hyperscan)
MACHINE_TYPE=$(uname -m)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
