Skip to content

ubootTools: fix build by fixing -idirafter ordering#212919

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
trofi:ubootTools-fix-idirafter
Jan 28, 2023
Merged

ubootTools: fix build by fixing -idirafter ordering#212919
vcunat merged 1 commit intoNixOS:staging-nextfrom
trofi:ubootTools-fix-idirafter

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jan 27, 2023

ubootTools build broke after #210004 where we started dropping default libc include path and switched to -idirafter way of specifying libc headers.

Unfortunately the way it's implemented it injects -idirafter after user's flags, not before. That allows users to inject their paths before libc include paths, not after (as it would notmally happen).

The change works it around for u-boot by pulling -idirafter libc flags before user's flags.

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@trofi
Copy link
Contributor Author

trofi commented Jan 27, 2023

Does not quite work for cross like pkgsCross.aarch64-multiplatform.ubootRaspberryPi4_64bit. Looking why.

@ofborg ofborg bot requested review from dezgeg, lopsided98 and samueldr January 27, 2023 08:22
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 27, 2023
`ubootTools` build broke after NixOS#210004
where we started dropping default libc include path and switched to
`-idirafter` way of specifying libc headers.

Unfortunately the way it's implemented it injects -idirafter after
user's flags, not before. That allows users to inject their paths before
libc include paths, not after (as it would notmally happen).

The change works it around for u-boot by pulling -idirafter libc flags
before user's flags.
@trofi trofi force-pushed the ubootTools-fix-idirafter branch from 4ec2b68 to 8b3a31f Compare January 27, 2023 08:32
@trofi
Copy link
Contributor Author

trofi commented Jan 27, 2023

Does not quite work for cross like pkgsCross.aarch64-multiplatform.ubootRaspberryPi4_64bit. Looking why.

Ah, buildPackages.stdenv.cc needs the same -idirafter treatment as stdenv.cc. Fixed.

@trofi trofi marked this pull request as ready for review January 27, 2023 08:34
@trofi
Copy link
Contributor Author

trofi commented Jan 27, 2023

Result of nixpkgs-review pr 212919 run on x86_64-linux 1

3 packages built:
  • diffoscope
  • ubootQemuX86
  • ubootTools

@alyssais alyssais requested a review from Ericson2314 January 27, 2023 09:41
@vcunat vcunat merged commit 277d34f into NixOS:staging-next Jan 28, 2023
@vcunat
Copy link
Member

vcunat commented Jan 28, 2023

Sounds OK as a workaround. Better focus effort on a more permanent approach later.

@trofi trofi deleted the ubootTools-fix-idirafter branch January 28, 2023 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments