Skip to content
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.

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

glibc: allow (cross)-build on case-insensitive fs #303868

Merged
merged 1 commit into from
Apr 14, 2024

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Apr 13, 2024

Description of changes

...such as APFS.

The problem here is that a change inside the 2.39 patchset creates a file ADVISORIES and also contains a directory advisories/ and both are considered the same file on APFS.

Reproducible with nix-build -A pkgsCross.gnu64.stdenv.cc on a aarch64-darwin host.

Hence, excluding the file from the patchset as it is non-functional anyways.
Closes #303193

cc @vcunat @quentinmit @ConnorBaker

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin (cross gnu64)
  • 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.05 Release Notes (or backporting 23.05 and 23.11 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.

...such as APFS.

The problem here is that a change inside the 2.39 patchset creates a
file `ADVISORIES` and also contains a directory `advisories/` and both
are considered the same file on APFS.

Reproducible with `nix-build -A pkgsCross.gnu64.stdenv.cc` on a
`aarch64-darwin` host.

Hence, excluding the file from the patchset as it is non-functional anyways.

Closes NixOS#303193
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Looks like a good compromise.

@Ma27 Ma27 merged commit dd8e61d into NixOS:staging Apr 14, 2024
30 checks passed
@Ma27 Ma27 deleted the glibc-case-insensitive-fs-build branch April 14, 2024 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants