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

boehm-gc: remove libatomic_ops, guile: 2.2.3 -> 2.2.4 #62850

Merged
merged 3 commits into from Jun 15, 2019

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

Follow up of #54402 for staging. This completely removes the libatomic_ops dependency of boehm-gc and removes the no longer needed dontStrip attribute.

libatomic_ops is not known to be needed on any platform supported by Nix, and if any platform did need it, it would still not work correctly because boehm-gc requires that all dependents link to libatomic_ops as well, if boehm-gc is linked with libatomic_ops. This is not currently done, so any package that uses boehm-gc would currently fail to compile on such a hypothetical platform. See #54402 for more details.

I also updated guile to 2.2.4.

cc @dtzWill because you reviewed #54402

  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@lopsided98 lopsided98 force-pushed the boehm-gc-remove-libatomic-ops branch from cce7f83 to 3a7b262 Compare June 8, 2019 02:48
@lopsided98 lopsided98 force-pushed the boehm-gc-remove-libatomic-ops branch from 3a7b262 to 08fed3b Compare June 8, 2019 02:49
@@ -14,9 +14,6 @@ stdenv.mkDerivation rec {
sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3";
};

buildInputs = [ libatomic_ops ];
Copy link
Member

Choose a reason for hiding this comment

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

Could you verify this works on 32-bit arm? I recall having to add it for static nix compilation, but maybe that was just because boost thought it needed it:

f1a5fb8

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was able to compile boehm-gc and nix for armv7l

@FRidh FRidh merged commit 0a7bc46 into NixOS:staging Jun 15, 2019
@lopsided98 lopsided98 deleted the boehm-gc-remove-libatomic-ops branch June 15, 2019 17:25
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

3 participants