Skip to content

libqmi: unbreak cross compilation#388297

Merged
uninsane merged 1 commit intoNixOS:stagingfrom
marcin-serwin:push-yznwlxkvoztq
Mar 9, 2025
Merged

libqmi: unbreak cross compilation#388297
uninsane merged 1 commit intoNixOS:stagingfrom
marcin-serwin:push-yznwlxkvoztq

Conversation

@marcin-serwin
Copy link
Contributor

@marcin-serwin marcin-serwin commented Mar 8, 2025

With meson 1.7.0 files needed for testing are not built by default 1. libqmi has incorrectly configured dependencies for gtk-doc generation thus they are not built unless tests are run 2. Since check phase is skipped for cross compiling this was causing the build failures, while the regular builds were unaffected. Setting doCheck to false will cause the install phase to fail also when compiling the package natively.

Fixes #384946

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-linux.pkgsCross.aarch64-multiplatform
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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 added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Mar 8, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Mar 8, 2025
@nix-owners nix-owners bot requested a review from jtojnar March 8, 2025 20:55
With meson 1.7.0 files needed for testing are not built by default [1].
`libqmi` has incorrectly configured dependencies for gtk-doc generation
thus they are not built unless tests are run [2]. Since check phase
is skipped for cross compiling this was causing the build failures,
while the regular builds were unaffected. Setting `doCheck` to false
will cause the install phase to fail also when compiling the package
natively.

[1]: https://mesonbuild.com/Release-notes-for-1-7-0.html#test-targets-no-longer-built-by-default
[2]: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124
Copy link
Contributor

@misuzu misuzu left a comment

Choose a reason for hiding this comment

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

Fixes the pkgsCross.riscv64.libqmi for me

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Mar 9, 2025
@uninsane uninsane merged commit d435aed into NixOS:staging Mar 9, 2025
36 checks passed
@marcin-serwin marcin-serwin deleted the push-yznwlxkvoztq branch March 11, 2025 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 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: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants