database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[chore](build) Bump the version of hyperscan (#25464)

Browse Source 
The latest version fixed the previous issue (https://github.com/intel/hyperscan/issues/292).
This commit is contained in:
Adonis Ling
2023-10-17 08:45:25 -05:00
committed by GitHub
parent d287f53d77
commit f6f1e3b646
3 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
thirdparty/download-thirdparty.sh vendored
View File

@ -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"

18
thirdparty/patches/hyperscan-5.4.0.patch vendored
View File

@ -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}

8
thirdparty/vars.sh vendored
View File

@ -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)