From 501c36789c0fe34d7f5d0daa0ed8bdd146645ddf Mon Sep 17 00:00:00 2001 From: wang_yue111 <648774160@qq.com> Date: Sat, 24 Jul 2021 15:44:19 +0800 Subject: [PATCH] Fix build error on X86 --- Fix-build-errot-on-x86_64.patch | 25 +++++++++++++++++++++++++ hyperscan.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 Fix-build-errot-on-x86_64.patch diff --git a/Fix-build-errot-on-x86_64.patch b/Fix-build-errot-on-x86_64.patch new file mode 100644 index 0000000..58ec1fa --- /dev/null +++ b/Fix-build-errot-on-x86_64.patch @@ -0,0 +1,25 @@ +From f92e690190b51eb6bada384174887501f4c3f43f Mon Sep 17 00:00:00 2001 +From: wang_yue111 <648774160@qq.com> +Date: Sat, 24 Jul 2021 10:21:03 +0800 +Subject: [PATCH] fix build error on X86 + +--- + cmake/build_wrapper.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/build_wrapper.sh b/cmake/build_wrapper.sh +index 1962813..895610c 100755 +--- a/cmake/build_wrapper.sh ++++ b/cmake/build_wrapper.sh +@@ -17,7 +17,7 @@ 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 p -g -D ${LIBC_SO} | sed -s 's/\([^ @]*\).*/^\1$/' >> ${KEEPSYMS} + # build the object + "$@" + # rename the symbols in the object +-- +2.23.0 + diff --git a/hyperscan.spec b/hyperscan.spec index 94e7830..3a53315 100644 --- a/hyperscan.spec +++ b/hyperscan.spec @@ -1,6 +1,6 @@ Name: hyperscan Version: 5.2.1 -Release: 2 +Release: 3 Summary: High-performance regular expression matching library License: BSD @@ -8,6 +8,7 @@ URL: https://www.hyperscan.io/ Source0: https://github.com/intel/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: hyperscan-aarch64-support.patch +Patch1: Fix-build-errot-on-x86_64.patch BuildRequires: gcc-c++ BuildRequires: boost-devel @@ -73,6 +74,9 @@ needed for developing Hyperscan applications. %{_includedir}/hs/ %changelog +* Sat Jul 24 2021 wangyue - 5.2.1-3 +- Fix build error on X86 + * Mon Jul 20 2020 Yikun Jiang - 5.2.1-2 - Add aarch64 support