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

vampire: portability fixes #43071

Merged
merged 3 commits into from Jul 5, 2018
Merged

vampire: portability fixes #43071

merged 3 commits into from Jul 5, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jul 5, 2018

Fix problems encountered using libc++, clang, and/or musl.

  • 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 dtzWill requested a review from gebner July 5, 2018 14:01
gebner
gebner approved these changes Jul 5, 2018
View reviewed changes
pkgs/applications/science/logic/vampire/fix-apple-cygwin-defines.patch Outdated


-#elif defined(__APPLE__)
+#elif defined(defined(__APPLE__))
Copy link
Member

Choose a reason for hiding this comment

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

Is this defined(defined(...)) incantation intentional?

@dtzWill
Copy link
Member Author

dtzWill commented Jul 5, 2018

Eeep! Nope, dishonor on me and my family. This is wrong, silly sed. Thanks for catching, will update shortly.

Kinda surprised that's not an error....

@gebner
Copy link
Member

gebner commented Jul 5, 2018

Please try to submit the other fixes upstream as well.

Otherwise looks good to me.

@dtzWill
Copy link
Member Author

dtzWill commented Jul 5, 2018

Please try to submit the other fixes upstream as well.

Otherwise looks good to me.

Great, will do! Thanks!

Turns out I actually had an old version of the patch here, whoops. Updated to what was submitted upstream and with the defined(defined(...)) fix (thanks!).

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: vampire

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: vampire

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: vampire

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@dtzWill
vampire: use CC/CXX from env, instead of always g++
8e6db30
@dtzWill
vampire: portability fixes
600abbe 
These have been submitted upstream,
but seconds before writing this message
so naturally no upstream response "yet" :).

Regardless of response, fetch patches
from the corresponding PR's for context
and of course hopefully they'll
be included in next version.
@dtzWill
vampire: enable parallel building
7353d83
@dtzWill
Copy link
Member Author

dtzWill commented Jul 5, 2018

All changes submitted upstream, patches are now fetched from corresponding PR's.

Apologies for the rebase'ing but hopefully this is much nicer :). Thanks for pushing me to submit upstream 👍.

Also enabled parallel building 😁.

@dtzWill
Copy link
Member Author

dtzWill commented Jul 5, 2018

Oh, and more complete fpu/fenv fix :).

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: vampire

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: vampire

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: vampire

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@dtzWill dtzWill merged commit 6798638 into NixOS:master Jul 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gebner gebner gebner approved these changes

Assignees
No one assigned
Labels
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
3 participants
@dtzWill @gebner @GrahamcOfBorg