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

Jump to bottom
Merged
Ericson2314 merged 2 commits into from
Apr 29, 2025
Merged

libblake3: fix FreeBSD cross-compile builds #401250

Ericson2314 merged 2 commits into from
Apr 29, 2025

Conversation

@silvanshade
Copy link
Member

@silvanshade silvanshade commented Apr 23, 2025 •
edited
Loading

This PR fixes libblake3 cross-compile builds for FreeBSD.

It also patches tbb to fix the tests on FreeBSD and Windows.

Follows from discussion at #401156

  • Built on platform(s)
    • mingw32
    • x86_64-freebsd
    • x86_64-linux

@silvanshade silvanshade requested review from Ericson2314 and fgaz April 23, 2025 22:12
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 23, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Apr 23, 2025
@nix-owners nix-owners bot requested review from fpletz, hesiod and thoughtpolice April 23, 2025 22:20
@silvanshade silvanshade mentioned this pull request Apr 23, 2025
Merged
1 task
Ericson2314
Ericson2314 reviewed Apr 24, 2025
View reviewed changes
Ericson2314
Ericson2314 reviewed Apr 24, 2025
View reviewed changes
@silvanshade silvanshade force-pushed the blake3-tbb-freebsd-fixes branch from 698ecc7 to 9c3f8a7 Compare April 24, 2025 17:28
@silvanshade
Copy link
Member Author

silvanshade commented Apr 24, 2025 •
edited
Loading

I made some changes addressing the reviews, notably adding the tbb patch for the other newer tbb releases and removing the override for patchPhase.

@silvanshade silvanshade requested a review from Ericson2314 April 25, 2025 14:46
@silvanshade silvanshade force-pushed the blake3-tbb-freebsd-fixes branch from 9c3f8a7 to d15765c Compare April 29, 2025 06:47
@Ericson2314 Ericson2314 merged commit 03dcb2b into NixOS:master Apr 29, 2025
24 of 27 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Apr 29, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-401250-to-release-24.11 origin/release-24.11
cd .worktree/backport-401250-to-release-24.11
git switch --create backport-401250-to-release-24.11
git cherry-pick -x 3e5422c2e7030dbeea5727094f66554a399fa76a d15765c0e91d1a8c1eb61e82318ae2945d93f5b2

@Ericson2314
Copy link
Member

Ericson2314 commented Apr 29, 2025

Oh combination of this and #402739 breaks eval, because two patches lists. We're fixing.

This was referenced Apr 29, 2025
Merged
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fgaz fgaz Awaiting requested review from fgaz

@fpletz fpletz Awaiting requested review from fpletz

@hesiod hesiod Awaiting requested review from hesiod

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@silvanshade @Ericson2314 @fgaz