From patchwork Wed Feb 2 14:41:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 36935 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1422E27BBEA; Wed, 2 Feb 2022 16:22:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 91B5927BBE9 for ; Wed, 2 Feb 2022 16:22:48 +0000 (GMT) Received: from localhost ([::1]:40514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFIP9-0004t6-M5 for patchwork@mira.cbaines.net; Wed, 02 Feb 2022 11:22:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFGpe-0007bQ-Aj for guix-patches@gnu.org; Wed, 02 Feb 2022 09:42:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58042) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFGpe-0004f8-19 for guix-patches@gnu.org; Wed, 02 Feb 2022 09:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nFGpd-0001f4-P6 for guix-patches@gnu.org; Wed, 02 Feb 2022 09:42:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53722] [PATCH staging 1/2] gnu: tbb: Fix test on AArch64. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Feb 2022 14:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53722 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53722@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16438128736303 (code B ref -1); Wed, 02 Feb 2022 14:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Feb 2022 14:41:13 +0000 Received: from localhost ([127.0.0.1]:51935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFGoq-0001db-Vi for submit@debbugs.gnu.org; Wed, 02 Feb 2022 09:41:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:44466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFGoo-0001dH-Da for submit@debbugs.gnu.org; Wed, 02 Feb 2022 09:41:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFGon-0006CQ-MJ for guix-patches@gnu.org; Wed, 02 Feb 2022 09:41:10 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:38708) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFGok-0004Oy-Bl for guix-patches@gnu.org; Wed, 02 Feb 2022 09:41:09 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 0038481014 for ; Wed, 2 Feb 2022 14:41:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo03-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qDMDv0RSoRkd for ; Wed, 2 Feb 2022 14:41:03 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id B024A81285 for ; Wed, 2 Feb 2022 14:41:03 +0000 (UTC) From: Simon South Date: Wed, 2 Feb 2022 09:41:01 -0500 Message-Id: <2b93c60ffb8c3ced234c023975a8e35f4bd3ba11.1643812145.git.simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=64.68.200.34; envelope-from=simon@simonsouth.net; helo=mailout.easymail.ca X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/tbb-fix-test-on-aarch64.patch: New file. * gnu/local.mk: Add it. * gnu/packages/tbb.scm (tbb)[source]: Apply it. --- gnu/local.mk | 1 + .../patches/tbb-fix-test-on-aarch64.patch | 35 +++++++++++++++++++ gnu/packages/tbb.scm | 4 +++ 3 files changed, 40 insertions(+) create mode 100644 gnu/packages/patches/tbb-fix-test-on-aarch64.patch diff --git a/gnu/local.mk b/gnu/local.mk index dceaa53145..ab96d06a34 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1843,6 +1843,7 @@ dist_patch_DATA = \ %D%/packages/patches/tao-fix-parser-types.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \ + %D%/packages/patches/tbb-fix-test-on-aarch64.patch \ %D%/packages/patches/tcc-boot-0.9.27.patch \ %D%/packages/patches/tclxml-3.2-install.patch \ %D%/packages/patches/tcsh-fix-autotest.patch \ diff --git a/gnu/packages/patches/tbb-fix-test-on-aarch64.patch b/gnu/packages/patches/tbb-fix-test-on-aarch64.patch new file mode 100644 index 0000000000..3a6003591e --- /dev/null +++ b/gnu/packages/patches/tbb-fix-test-on-aarch64.patch @@ -0,0 +1,35 @@ +From 013035b4e9af39f506e87ae6b755c3363e768d4d Mon Sep 17 00:00:00 2001 +From: Vladislav Shchapov +Date: Thu, 23 Dec 2021 19:17:24 +0500 +Subject: [PATCH] Fix issue #687 (test_eh_thread) (#697) + +Signed-off-by: Vladislav Shchapov +--- + test/tbb/test_eh_thread.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/test/tbb/test_eh_thread.cpp b/test/tbb/test_eh_thread.cpp +index aa6d764d..af291f48 100644 +--- a/test/tbb/test_eh_thread.cpp ++++ b/test/tbb/test_eh_thread.cpp +@@ -36,6 +36,7 @@ + // TODO: enable limitThreads with sanitizer under docker + #if TBB_USE_EXCEPTIONS && !_WIN32 && !__ANDROID__ + ++#include + #include + #include + #include +@@ -73,7 +74,8 @@ public: + mValid = false; + pthread_attr_t attr; + // Limit the stack size not to consume all virtual memory on 32 bit platforms. +- if (pthread_attr_init(&attr) == 0 && pthread_attr_setstacksize(&attr, 100*1024) == 0) { ++ std::size_t stacksize = utils::max(128*1024, PTHREAD_STACK_MIN); ++ if (pthread_attr_init(&attr) == 0 && pthread_attr_setstacksize(&attr, stacksize) == 0) { + mValid = pthread_create(&mHandle, &attr, thread_routine, /* arg = */ nullptr) == 0; + } + } +-- +2.34.0 + diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm index e5d8394f5f..ef92e6db69 100644 --- a/gnu/packages/tbb.scm +++ b/gnu/packages/tbb.scm @@ -41,6 +41,10 @@ (define-public tbb (sha256 (base32 "0ih727g802j9lvwkqhw021bk1wb7xlvfgd0vl1i6jng4am1wv7vq")))) + (patches (list + ;; Backport an upstream commit that prevents the + ;; "test_eh_thread" test failing on AArch64. + (search-patch "tbb-fix-test-on-aarch64.patch"))))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DTBB_STRICT=OFF"))) ;; Don't fail on warnings