From patchwork Wed Apr 21 21:26:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4196 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FQYXD3VKCz44R5 for ; Wed, 21 Apr 2021 21:26:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FQYXD1Mlwz1vH; Wed, 21 Apr 2021 21:26:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FQYXD0TCKz2yK0; Wed, 21 Apr 2021 21:26:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FQYXC0Bk5z2xmd for ; Wed, 21 Apr 2021 21:26:35 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FQYXB4Nq2zZN; Wed, 21 Apr 2021 21:26:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1619040394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SsDFGvkK0r1sJw00v0NYuImMFBDo/WN0QkLgizFfwQA=; b=5Y9xQK5dHdyZ+l4N0Wxms7l7Y8dLwE4PRMAsg3gjY4SPZAaZdhs82Zo/5xKz3x0II3ol7M xt7l40x3WtvIWSCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1619040394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SsDFGvkK0r1sJw00v0NYuImMFBDo/WN0QkLgizFfwQA=; b=cLkeCt9at9wUSaVtSuXsXrrhK+Hg55X9dMjwl1R8L7WVm50j1/zfrBrseZYL1M7MDF9neW Bjktga37EpmH3yMn1J4D1WgC61bNDz/aMIAiWlQ7QhqQkEVR3LpGbqoBiezvoAJex2R62U lstqu1FJppJ52pdgwrqDbEkTIjQQd4WiAdP/B4JpbfNTS3yGgtwr/5OVzniylFAuZ0oeM1 7X/pIqCrSQdFXxegqk58ZFqLVEjPnaaxYPbBmfJ7HAkL5P0xiZAqv64fG/9i8T2KC1dp8Y jKxJjb0jR7yZV4si6eQPLIcr1d1ptofj95fuEAAa5yKOw+36XKwP+ORJz32YzA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/4] hyperscan: Patch required to build with updated binutils-2.36.1 Date: Wed, 21 Apr 2021 23:26:24 +0200 Message-Id: <20210421212626.2729436-2-adolf.belka@ipfire.org> In-Reply-To: <20210421212626.2729436-1-adolf.belka@ipfire.org> References: <20210421212626.2729436-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Updated binutils caused failure in build of hyperscan Patch solved the problem https://github.com/intel/hyperscan/issues/292, avoid the compilation error reporting 'undefined reference to `avx2_snprintf`' etc. - Thanks to Michael Tremer and Marcel Lorenz for guidance on the patch Signed-off-by: Adolf Belka --- lfs/hyperscan | 1 + ...can-5.4.0-fix-undefined-reference-to.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch diff --git a/lfs/hyperscan b/lfs/hyperscan index f89b20224..7258d93dd 100644 --- a/lfs/hyperscan +++ b/lfs/hyperscan @@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DBUILD_SHARED_LIBS:BOOL=ON \ diff --git a/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch b/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch new file mode 100644 index 000000000..fdd2543f1 --- /dev/null +++ b/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch @@ -0,0 +1,24 @@ +From 66189546403e5476c560bdbad89d24c3df87b172 Mon Sep 17 00:00:00 2001 +From: Yue Ni +Date: Tue, 19 Jan 2021 17:03:02 +0800 +Subject: [PATCH] Fix hyperscan compilation issue for + https://github.com/intel/hyperscan/issues/292, avoid the compilation error + reporting 'undefined reference to `avx2_snprintf`'. + +--- + 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 1962813f..895610c0 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