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.

Sign up for GitHub

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

Jump to bottom

mbuffer: Use objdump from environment when cross-building #96743

Merged
merged 1 commit into from Aug 31, 2020
Merged

mbuffer: Use objdump from environment when cross-building #96743

merged 1 commit into from Aug 31, 2020

Conversation

kampka
Copy link
Contributor

@kampka kampka commented Aug 31, 2020

Motivation for this change

The mbuffer configure scripts fails to recognize the correct
objdump binary during cross-building for foreign platforms.
The correct objdump is exposed via the environment variable
$OBJDUMP, which should be used in such cases.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@kampka
Copy link
Contributor Author

kampka commented Aug 31, 2020

@GrahamcOfBorg build mbuffer
@GrahamcOfBorg build pkgsCross.raspberryPi.mbuffer

@ofborg ofborg bot requested a review from tokudan August 31, 2020 09:09
@kampka kampka added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Aug 31, 2020
@FRidh
Copy link
Member

FRidh commented Aug 31, 2020

I suppose in this case applying this conditionally would be fine in which case that would be preferred. Maybe do include a comment this is especially needed for cross otherwise the next person may remove it again.

@kampka
mbuffer: Use objdump from environment when cross-building
62edf38 
The mbuffer configure scripts fails to recognize the correct
objdump binary during cross-building for foreign platforms.
The correct objdump is exposed via the environment variable
$OBJDUMP, which should be used in such cases.
@kampka
Copy link
Contributor Author

kampka commented Aug 31, 2020

Maybe do include a comment this is especially needed for cross otherwise the next person may remove it again.

Done

@FRidh FRidh merged commit 2b1ce61 into NixOS:master Aug 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tokudan tokudan Awaiting requested review from tokudan

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@kampka @FRidh