Skip to content

mesa: only build with valgrind if available on host platform#337065

Closed
NickCao wants to merge 1 commit intoNixOS:stagingfrom
NickCao:mesa-valgrind
Closed

mesa: only build with valgrind if available on host platform#337065
NickCao wants to merge 1 commit intoNixOS:stagingfrom
NickCao:mesa-valgrind

Conversation

@NickCao
Copy link
Member

@NickCao NickCao commented Aug 24, 2024

Description of changes

This fixes the evaluation/build of mesa on riscv and other platforms that valgrind doesn't have support for. And valgrind is an optional dependency by default: https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-24.1.6/meson.build?ref_type=tags#L1912

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.

@ofborg ofborg bot requested review from primeos and vcunat August 24, 2024 19:39
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 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 Aug 24, 2024
Copy link

@skeuchel skeuchel left a comment

Choose a reason for hiding this comment

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

As detailed in my comment, the (lib.mesonEnable "valgrind" false) part needs fixing. Other than that it LGTM. Will try to build it on riscv64-linux as well.

Copy link

@skeuchel skeuchel left a comment

Choose a reason for hiding this comment

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

Now it's a NOOP on the platforms valgrind is available on, so LGTM.

@skeuchel
Copy link

As a side note, to get this to build on riscv64-linux I had to disable the intel and iris drivers. I also rebased my build onto master.

@vcunat
Copy link
Member

vcunat commented Aug 29, 2024

Pushed directly to staging-next as 63b3021.

@vcunat vcunat closed this Aug 29, 2024
@NickCao NickCao deleted the mesa-valgrind branch August 29, 2024 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 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

Development

Successfully merging this pull request may close these issues.

3 participants

Comments