Skip to content

rav1e: fix clang-19 by using system libgit2 / lib#355124

Merged
emilazy merged 1 commit intoNixOS:llvm-19from
paparodeo:rav1e-update-lockfile
Nov 12, 2024
Merged

rav1e: fix clang-19 by using system libgit2 / lib#355124
emilazy merged 1 commit intoNixOS:llvm-19from
paparodeo:rav1e-update-lockfile

Conversation

@paparodeo
Copy link
Contributor

@paparodeo paparodeo commented Nov 11, 2024 •
edited
Loading

build fails on clang-19 due to an old vendored libgit2 / zlib. unvendoring libgit2 fixes the build.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@emilazy

@paparodeo paparodeo marked this pull request as draft November 11, 2024 09:26
@ofborg ofborg bot requested a review from getchoo November 11, 2024 18:48
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Nov 11, 2024
@getchoo
Copy link
Member

getchoo commented Nov 11, 2024

perhaps there is a more targeted way to just update one header file in a vendored package without needed to regenerate a Cargo.lock which updates more dependencies than needed.

Maybe you could use the substituteInPlace $cargoDepsCopy pattern?

@paparodeo paparodeo changed the title rav1e: updated Cargo.lock to fix build rav1e: fix clang-19 by using system lib Nov 11, 2024
@paparodeo paparodeo changed the title rav1e: fix clang-19 by using system lib rav1e: fix clang-19 by using system zlib Nov 11, 2024
@paparodeo paparodeo marked this pull request as ready for review November 11, 2024 20:19
getchoo
getchoo approved these changes Nov 11, 2024
View reviewed changes
@getchoo getchoo added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Nov 11, 2024
paparodeo
paparodeo commented Nov 11, 2024
View reviewed changes
@wegank wegank removed 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Nov 11, 2024
@paparodeo paparodeo changed the title rav1e: fix clang-19 by using system zlib rav1e: fix clang-19 by using system libgit2 / lib Nov 12, 2024
@paparodeo
rav1e: fix clang-19 using system libgit2 / zlib
bc96a0b 
update the unnecessary `built` package so we can use the system libgit2
and zlib which fixes the clang-19 build
emilazy
emilazy approved these changes Nov 12, 2024
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thank you! Sorry this one was such a pain.

@emilazy emilazy merged commit 235d933 into NixOS:llvm-19 Nov 12, 2024
@paparodeo paparodeo deleted the rav1e-update-lockfile branch November 12, 2024 00:19
@paparodeo paparodeo mentioned this pull request Nov 12, 2024
Merged
13 tasks
emilazy added a commit to emilazy/nixpkgs that referenced this pull request Nov 16, 2024
@emilazy
rav1e: fix clang-19 by using system libgit2 / lib (NixOS#355124)
2a679af
emilazy added a commit that referenced this pull request Nov 17, 2024
@emilazy
rav1e: fix clang-19 by using system libgit2 / lib (#355124)
0343b1f
emilazy added a commit to emilazy/nixpkgs that referenced this pull request Nov 18, 2024
@emilazy
rav1e: fix clang-19 by using system libgit2 / lib (NixOS#355124)
b1074df
emilazy added a commit that referenced this pull request Nov 18, 2024
@emilazy
rav1e: fix clang-19 by using system libgit2 / lib (#355124)
c8c3b7e
emilazy added a commit that referenced this pull request Nov 20, 2024
@emilazy
rav1e: fix clang-19 by using system libgit2 / lib (#355124)
43e7f01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emilazy emilazy emilazy approved these changes

@getchoo getchoo getchoo approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@paparodeo @getchoo @emilazy @wegank