forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tbb: Split into tbb_2020_3 and tbb_2021_8
This is based on PR NixOS#214762. For the new release 2021.8, see https://www.intel.com/content/www/us/en/developer/articles/release-notes/intel-oneapi-threading-building-blocks-release-notes.html https://github.com/oneapi-src/oneTBB/releases/tag/v2021.5.0 https://github.com/oneapi-src/oneTBB/releases/tag/v2021.6.0 https://github.com/oneapi-src/oneTBB/releases/tag/v2021.7.0 Due to the significant breakage due to the update to TBB 2021.8, instead split the tbb package into tbb_2020_3 and tbb_2021_8, with the default tbb aliased to tbb_2020_3 in order to minimize breakage. Also fixed build issues and improved code. Co-Authored-By: Martin Weinelt <[email protected]> Co-Authored-By: davidak <[email protected]>
- Loading branch information
3 people
committed
Mar 2, 2023
1 parent
4f4c53e
commit cc541cb
Showing
3 changed files
with
138 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| { lib | ||
| , stdenv | ||
| , fetchurl | ||
| , fetchFromGitHub | ||
| , fixDarwinDylibNames | ||
| }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "tbb"; | ||
| version = "2020.3"; | ||
|
|
||
| outputs = [ "out" "dev" ]; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "oneapi-src"; | ||
| repo = "oneTBB"; | ||
| rev = "v${version}"; | ||
| sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; | ||
| }; | ||
|
|
||
| patches = [ | ||
| # Fixes build with Musl. | ||
| (fetchurl { | ||
| url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch"; | ||
| sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs="; | ||
| }) | ||
|
|
||
| # Fixes build with Musl. | ||
| (fetchurl { | ||
| url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; | ||
| sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; | ||
| }) | ||
|
|
||
| # Fixes build with upcoming gcc-13: | ||
| # https://github.com/oneapi-src/oneTBB/pull/833 | ||
| (fetchurl { | ||
| name = "gcc-13.patch"; | ||
| url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch"; | ||
| sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg="; | ||
| }) | ||
|
|
||
| # Fixes build for aarch64-darwin | ||
| (fetchurl { | ||
| name = "aarch64-darwin.patch"; | ||
| url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch"; | ||
| sha256 = "sha256-JXqrFPCb3q1vfxk752tQu7HhApCB4YH2LoVnGRwmspk="; | ||
| }) | ||
| ]; | ||
|
|
||
| nativeBuildInputs = (lib.optionals stdenv.isDarwin [ | ||
| fixDarwinDylibNames | ||
| ]); | ||
|
|
||
| makeFlags = lib.optionals stdenv.cc.isClang [ | ||
| "compiler=clang" | ||
| ] ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) | ||
| (if stdenv.hostPlatform.isAarch64 then "arch=arm64" | ||
| else if stdenv.hostPlatform.isx86_64 then "arch=intel64" | ||
| else throw "Unsupported cross architecture")); | ||
|
|
||
| enableParallelBuilding = true; | ||
|
|
||
| installPhase = '' | ||
| runHook preInstall | ||
| mkdir -p $out/lib | ||
| cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ | ||
| mv include $out/ | ||
| rm $out/include/index.html | ||
| runHook postInstall | ||
| ''; | ||
|
|
||
| postInstall = let | ||
| pcTemplate = fetchurl { | ||
| url = "https://github.com/oneapi-src/oneTBB/raw/478de5b1887c928e52f029d706af6ea640a877be/integration/pkg-config/tbb.pc.in"; | ||
| sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI="; | ||
| }; | ||
| in '' | ||
| # Generate pkg-config file based on upstream template. | ||
| # It should not be necessary with tbb after 2021.2. | ||
| mkdir -p "$out/lib/pkgconfig" | ||
| substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \ | ||
| --subst-var-by CMAKE_INSTALL_PREFIX "$out" \ | ||
| --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \ | ||
| --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \ | ||
| --subst-var-by TBB_VERSION "${version}" \ | ||
| --subst-var-by TBB_LIB_NAME "tbb" | ||
| ''; | ||
|
|
||
| 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 ]; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters