tbb_2021_5: remove

This commit is contained in:
Yureka 2024-12-09 18:02:31 +01:00 committed by Martin Weinelt
parent 09b61573f1
commit 77e9ee7463
4 changed files with 1 additions and 85 deletions

View file

@ -1,71 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
}:
stdenv.mkDerivation rec {
pname = "tbb";
version = "2021.5.0";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneTBB";
rev = "v${version}";
hash = "sha256-TJ/oSSMvgtKuz7PVyIoFEbBW6EZz7t2wr/kP093HF/w=";
};
nativeBuildInputs = [
cmake
];
patches = [
# port of https://github.com/oneapi-src/oneTBB/pull/1031
./gcc13-fixes-2021.5.0.patch
(fetchpatch {
# Fix "field used uninitialized" on modern gcc versions (https://github.com/oneapi-src/oneTBB/pull/958)
url = "https://github.com/oneapi-src/oneTBB/commit/3003ec07740703e6aed12b028af20f4b0f16adae.patch";
hash = "sha256-l4+9IxIEdRX/q8JyDY9CPKWzSLatpIVSiNjmIM7ilj0=";
})
];
# Disable failing test on musl
# test/conformance/conformance_resumable_tasks.cpp:37:24: error: suspend is not a member of tbb::v1::task; did you mean tbb::detail::r1::suspend?
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace test/CMakeLists.txt \
--replace-fail 'conformance_resumable_tasks' ""
'';
# Fix build with modern gcc
# In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=array-bounds" "-Wno-error=stringop-overflow" "-Wno-address" ] ++
# error: variable 'val' set but not used
lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++
# Workaround for gcc-12 ICE when using -O3
# https://gcc.gnu.org/PR108854
lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ];
# Fix undefined reference errors with version script under LLVM.
NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version";
meta = with lib; {
description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/";
license = licenses.asl20;
longDescription = ''
Intel Threading Building Blocks offers a rich and complete approach to
expressing parallelism in a C++ program. It is a library that helps you
take advantage of multi-core processor performance without having to be a
threading expert. Intel TBB is not just a threads-replacement library. It
represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance.
'';
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice tmarkus ];
};
}

View file

@ -1,13 +0,0 @@
diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h
index 33bc8ab4..a3d21baf 100644
--- a/test/common/utils_assert.h
+++ b/test/common/utils_assert.h
@@ -20,6 +20,8 @@
#include "config.h"
#include "utils_report.h"
+#include <cstdlib>
+
#define REPORT_FATAL_ERROR REPORT
namespace utils {

View file

@ -1259,6 +1259,7 @@ mapAliases {
taplo-cli = taplo; # Added 2022-07-30
taplo-lsp = taplo; # Added 2022-07-30
taro = taproot-assets; # Added 2023-07-04
tbb_2021_5 = throw "tbb_2021_5 has been removed from nixpkgs, as it broke with GCC 14";
tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
tclcurl = tclPackages.tclcurl; # Added 2024-10-02
tcllib = tclPackages.tcllib; # Added 2024-10-02

View file

@ -6973,7 +6973,6 @@ with pkgs;
swi-prolog-gui = swi-prolog.override { withGui = true; };
tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ;
tbb_2021_11 = callPackage ../development/libraries/tbb { };
tbb_2022_0 = callPackage ../development/libraries/tbb/2022_0.nix { };
# many packages still fail with latest version