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

cryus-sasl: cleanup, fix w/musl (although not at all musl-specific) #47129

Merged
merged 2 commits into from Sep 24, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Sep 21, 2018

musl is fixed by disabling update of config.{guess,sub}.

Let's check how this fares on Aarch64, since that platform (I think?)
also automatically updates these files by default.

Fixes #47105.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@dtzWill
Copy link
Member Author

dtzWill commented Sep 21, 2018

Hopefully 2.1.27 is soon and is much less broken regarding autoconf/libtool bits. Looks like we're in the minority for not having a big stack of patches for this already.
(the LFS patch currently applied on FreeBSD has some fixes for this, FWIW)

@Mic92
Copy link
Member

Mic92 commented Sep 21, 2018

musl is fixed by disabling update of config.{guess,sub}.
@dtzWill
Copy link
Member Author

dtzWill commented Sep 21, 2018

Good call, and sorry for the review-invite spam after rebase.

'';
# Avoid triggering regenerating using broken autoconf/libtool bits.
# (many distributions carry patches to remove/replace, but this works for now)
dontUpdateAutotoolsGnuConfigScripts = true;
Copy link
Member

Choose a reason for hiding this comment

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

I wonder why this breaks things?

Copy link
Member

Choose a reason for hiding this comment

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

Maybe set it to null if not musl.

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think it will work on any platform, it's just that only musl and aarch64 (IIRC) automatically attempt to do this for all packages. And it seems better to ensure it doesn't happen than hope the boolean expression here is always up-to-date with the list of platforms that add the auto-update-config-guess setup hook...?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah makes sense. I wonder if it just needs to regenerate some files though? Changing the config.* files should be harmless.

Unclear what the problem is exactly regarding regenerating files,
so this makes the change only impact build configs known to need it.
@dtzWill
Copy link
Member Author

dtzWill commented Sep 24, 2018

Alright I'll just set to null on non-musl. Thanks!

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.

None yet

4 participants