Skip to content

Comments

openldap: fix cross-compilation#174049

Merged
dasJ merged 1 commit intoNixOS:staging-nextfrom
Mindavi:openldap/cross
May 23, 2022
Merged

openldap: fix cross-compilation#174049
dasJ merged 1 commit intoNixOS:staging-nextfrom
Mindavi:openldap/cross

Conversation

@Mindavi
Copy link
Contributor

@Mindavi Mindavi commented May 22, 2022

Description of changes

Fixes cross-compilation for openldap. Openldap is also a dependency of udisks2.

Staging-next: #173605

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux (cross-compiled)
    • 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/)
  • 22.05 Release Notes (or backporting 21.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.

@Mindavi Mindavi added 6.topic: cross-compilation Building packages on a different platform than they will be used on 0.kind: build failure A package fails to build labels May 22, 2022
@ofborg ofborg bot requested review from ajs124, dasJ and mweinelt May 22, 2022 22:02
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 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. labels May 22, 2022
@vcunat
Copy link
Member

vcunat commented May 23, 2022

Perhaps conditionally on cross only? I'm not too fond of the rebuild amount at this stage, if it improves basically nothing (on those rebuild platforms).

@Mindavi
Copy link
Contributor Author

Mindavi commented May 23, 2022

Thanks. I agree, made it conditional for now.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 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. labels May 23, 2022
@dasJ
Copy link
Member

dasJ commented May 23, 2022

I'm a bit afraid to last-minute merge this, altough the breakages should be minimal.
Maybe we should wait until the branch-off (this evening european time), target staging with this and assign the backport staging-22.05 label?

@Mindavi
Copy link
Contributor Author

Mindavi commented May 23, 2022

This should have the same effect as the previously added STRIP= in makeFlags, as far as I can tell (didn't research in any way, but strong assumption), the flag was just renamed from STRIP to STRIP_OPTS.

Since it's now conditional on cross-compiling, it shouldn't affect any native packages.

I don't really mind if we do this now or after the release (possibly with a backport). If we do it after the release I will make it unconditional again. I'm not in a rush. But I saw it broke on staging-next where master was fine, and I'm trying to keep cross regressions low.

@vcunat
Copy link
Member

vcunat commented May 23, 2022

Yes, the effect is cross-only (including rebuilds), and even there it doesn't seem risky.

@dasJ
Copy link
Member

dasJ commented May 23, 2022

After talking to @mweinelt, it seems to be a good idea to target master with this PR and to merge it once staging-next is in, backporting this to release-22.05.
This way we can skip staging altogether because it's not a mass-rebuild anymore.

@mweinelt
Copy link
Member

I don't mind either as it doesn't cause rebuilds on hydra anyway.

@vcunat
Copy link
Member

vcunat commented May 23, 2022

It's only targeted at staging-next because it's only needed after the update that's in master..staging-next now.

@dasJ
Copy link
Member

dasJ commented May 23, 2022

Alright, then

@dasJ dasJ merged commit 54c2bcd into NixOS:staging-next May 23, 2022
@Mindavi Mindavi deleted the openldap/cross branch May 23, 2022 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0.kind: build failure A package fails to build 6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants