Skip to content

libblake3: fix FreeBSD cross-compile builds #401250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 2 commits into from
Apr 29, 2025
Merged

libblake3: fix FreeBSD cross-compile builds #401250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e5422c
tbb: fix tests on FreeBSD and Windows
silvanshade Apr 23, 2025
d15765c
libblake3: fix FreeBSD cross-compile builds
silvanshade Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/by-name/li/libblake3/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
stdenv,
cmake,
fetchFromGitHub,
fetchpatch,
tbb_2021_11,

useTBB ? true,
Expand All @@ -28,6 +29,15 @@ stdenv.mkDerivation (finalAttrs: {
tbb_2021_11
];

patches = [
# build(cmake): Relax Clang frontend variant detection (BLAKE3-team/BLAKE3#477)
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/BLAKE3-team/BLAKE3/pull/477.patch";
hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls=";
relative = "c";
})
];

cmakeFlags = [
(lib.cmakeBool "BLAKE3_USE_TBB" useTBB)
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
Expand Down
11 changes: 6 additions & 5 deletions pkgs/development/libraries/tbb/2022_0.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ stdenv.mkDerivation rec {
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
})
];

cmakeFlags = [
# Skip tests to work around https://github.com/uxlfoundation/oneTBB/issues/1695
(lib.cmakeBool "TBB_TEST" (!stdenv.hostPlatform.isWindows))
# Fix tests on FreeBSD and Windows
(fetchpatch {
name = "fix-tbb-freebsd-and-windows-tests.patch";
url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
})
];

# Fix build with modern gcc
Expand Down
11 changes: 6 additions & 5 deletions pkgs/development/libraries/tbb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ stdenv.mkDerivation rec {
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1193.patch";
hash = "sha256-ZQbwUmuIZoGVBof8QNR3V8vU385e2X7EvU3+Fbj4+M8=";
})
];

cmakeFlags = [
# Skip tests to work around https://github.com/uxlfoundation/oneTBB/issues/1695
(lib.cmakeBool "TBB_TEST" (!stdenv.hostPlatform.isWindows))
# Fix tests on FreeBSD and Windows
(fetchpatch {
name = "fix-tbb-freebsd-and-windows-tests.patch";
url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
})
Comment thread
silvanshade marked this conversation as resolved.
Outdated
];

# Fix build with modern gcc
Expand Down