From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ULxEIkKFVmO8HAAAbAwnHQ (envelope-from ) for ; Mon, 24 Oct 2022 14:29:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id eJdQIkKFVmMrfAEA9RJhRA (envelope-from ) for ; Mon, 24 Oct 2022 14:29:54 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 258D1ABE4 for ; Mon, 24 Oct 2022 14:29:54 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omwTP-0001zW-1z; Mon, 24 Oct 2022 08:22:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omwR6-00011C-OQ for guix-patches@gnu.org; Mon, 24 Oct 2022 08:20:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omwR1-00055d-B1 for guix-patches@gnu.org; Mon, 24 Oct 2022 08:20:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omwR0-0004q5-5s for guix-patches@gnu.org; Mon, 24 Oct 2022 08:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58757] [PATCH staging] gnu: tbb: Update to 2021.6.0. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Oct 2022 12:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58757 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58757@debbugs.gnu.org Received: via spool by 58757-submit@debbugs.gnu.org id=B58757.166661395718543 (code B ref 58757); Mon, 24 Oct 2022 12:20:02 +0000 Received: (at 58757) by debbugs.gnu.org; 24 Oct 2022 12:19:17 +0000 Received: from localhost ([127.0.0.1]:47282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omwQG-0004p0-Ii for submit@debbugs.gnu.org; Mon, 24 Oct 2022 08:19:17 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:36580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omwQE-0004om-FC for 58757@debbugs.gnu.org; Mon, 24 Oct 2022 08:19:15 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id E7DF865F49 for <58757@debbugs.gnu.org>; Mon, 24 Oct 2022 12:19:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nmQlMMT6qOZK for <58757@debbugs.gnu.org>; Mon, 24 Oct 2022 12:19:08 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 9519465C23 for <58757@debbugs.gnu.org>; Mon, 24 Oct 2022 12:19:08 +0000 (UTC) From: Simon South Date: Mon, 24 Oct 2022 08:19:06 -0400 Message-Id: <43b43634f5fd194d8e7e3003a7cd6ca44bd2b4ba.1666611894.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1666614594; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=hAyoUOc08vBqsSW7oy1YfLD2pGQqYxqJyPQwPQ/6pGc=; b=LYZQ4yA/5E7s0lPr/IUDK3I7DzKaXvSDnXyuQIvCqJOkgG54IsAb0+v3NrRQtqWeCKR14M xI9umUcnMFHC0TyTx1q14znTpPEng728mpQVfgmISwDiIooK1jVlpP8EEzpOZoaPt6FdHf u37ow4UPuNxGwtrpdSw5lUptAb1CSXvyrIEjZW/nbdSynnM0woqzWkBZ94hqc8RzF15NI2 +sj6+jvB6rCidOpZaRj2B+tV7/pp4EnMuWozHsEW+udZeRFJJ027Meh5IN7X/Q1Td+peK4 cmUSks54KwYTw9CS/2jzxcxQK0zEhPS04HYny3IRTWo1rvUBWtYZXmFBQPP+lw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1666614594; a=rsa-sha256; cv=none; b=QWuXrOKeDtEm/Ae8bAoXUNtJN46eAw0Hn3s6gz3iywmN5jrrisiaOBLsnN3QVfHXBKf7eG euIReHVkHZfYooqxKc/eR67BkO1fJACklGbcdRZ2ceqDwMOXy+KJXTWYpkif94xKLO+i+T E1Cuas3xyov4FqAWNpremq1UICwW5cTcDvn3hQmluyMQXX5QwFLG7BwU6HUnTd7vGVNV+8 lgpg4Av+5a761tJ1oZs7YK5LnTUbklM7cPuTjOALeybhMmAw6IEwuemEEELWJ6OghTM/YS +u/bblYdI+nwNpFRckvddGMiFDuQgkVpWOJ9FyM5kHPizIFZcKsIcnnkmw/FKw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.10 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 258D1ABE4 X-Spam-Score: -0.10 X-Migadu-Scanner: scn1.migadu.com X-TUID: MQMaWfj+j9Uh * gnu/packages/tbb.scm (tbb): Update to 2021.6.0. [source]: Remove obsolete patch. * gnu/packages/patches/tbb-fix-test-on-aarch64.patch: Delete file. * gnu/local.mk: Remove it. * gnu/packages/patches/tbb-other-arches.patch: Update to match new version. --- gnu/local.mk | 1 - .../patches/tbb-fix-test-on-aarch64.patch | 35 ------------------- gnu/packages/patches/tbb-other-arches.patch | 8 ++--- gnu/packages/tbb.scm | 10 ++---- 4 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 gnu/packages/patches/tbb-fix-test-on-aarch64.patch diff --git a/gnu/local.mk b/gnu/local.mk index c721718301..8f1e37f356 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1870,7 +1870,6 @@ 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/tbb-other-arches.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 deleted file mode 100644 index 3a6003591e..0000000000 --- a/gnu/packages/patches/tbb-fix-test-on-aarch64.patch +++ /dev/null @@ -1,35 +0,0 @@ -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/patches/tbb-other-arches.patch b/gnu/packages/patches/tbb-other-arches.patch index b649eb3eb8..0ebfde165c 100644 --- a/gnu/packages/patches/tbb-other-arches.patch +++ b/gnu/packages/patches/tbb-other-arches.patch @@ -1,8 +1,8 @@ diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h -index 8ecc2378..0cf26f85 100644 +index f904a8e9..405f92e6 100644 --- a/src/tbb/tools_api/ittnotify_config.h +++ b/src/tbb/tools_api/ittnotify_config.h -@@ -159,6 +159,11 @@ +@@ -163,6 +163,11 @@ # define ITT_ARCH_ARM64 6 #endif /* ITT_ARCH_ARM64 */ @@ -14,7 +14,7 @@ index 8ecc2378..0cf26f85 100644 #ifndef ITT_ARCH # if defined _M_IX86 || defined __i386__ # define ITT_ARCH ITT_ARCH_IA32 -@@ -172,6 +177,8 @@ +@@ -176,6 +181,8 @@ # define ITT_ARCH ITT_ARCH_ARM64 # elif defined __powerpc64__ # define ITT_ARCH ITT_ARCH_PPC64 @@ -24,7 +24,7 @@ index 8ecc2378..0cf26f85 100644 #endif diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 9534dce8..51a79331 100644 +index 2aa669c9..f915e252 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -387,7 +387,10 @@ if (TARGET TBB::tbb) diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm index d8c7d59c8d..4ce7c1cf49 100644 --- a/gnu/packages/tbb.scm +++ b/gnu/packages/tbb.scm @@ -32,7 +32,7 @@ (define-module (gnu packages tbb) (define-public tbb (package (name "tbb") - (version "2021.5.0") + (version "2021.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -41,12 +41,8 @@ (define-public tbb (file-name (git-file-name name version)) (sha256 (base32 - "1z0pqzfx63zrmyqdvvkk8vl5dc0i0n5cimdkrypd50ig4d4yi7sc")) - (patches - ;; Backport an upstream commit that prevents the - ;; "test_eh_thread" test failing on AArch64. - (search-patches "tbb-fix-test-on-aarch64.patch" - "tbb-other-arches.patch")))) + "039v4jmnkkxs7haxrfmk9j57vfbrwlhjynlm5byfaqddv4cbsy0p")) + (patches (search-patches "tbb-other-arches.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DTBB_STRICT=OFF"))) ;; Don't fail on warnings -- 2.38.0