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

Correct boost configure phase when enablePython is false #33393

Merged
merged 1 commit into from Jan 3, 2018

Conversation

bnikolic
Copy link
Contributor

@bnikolic bnikolic commented Jan 3, 2018

The bootstrap script does not seem to have --without-python; instead
just omit --with-python option

Motivation for this change

configurationPhase currently fails when enablePython is false (e.g., when cross-compiling this is the default).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@Ericson2314
Copy link
Member

Ericson2314 commented Jan 3, 2018

Oops, this is my bad. It was like that before

Do you think you can keep the order the same to avoid a mass rebuild? Also could you rebase on https://github.com/obsidiansystems/nixpkgs/tree/ericson2314-cross-base (trying to be defensive about pulling commits from master, but maybe this isn't needed post-@GrahamcOfBorg)

@bnikolic
Copy link
Contributor Author

bnikolic commented Jan 3, 2018

Rebased and corrected. PR is still showing against Nixos master, not sure how to switch it to your branch @Ericson2314

The bootstrap script does not seem to have --without-python; instead
just omit --with-python option
@Ericson2314
Copy link
Member

@bnikolic that's because the rebase duplicated a bunch of commits from master that were previously on your branch but not mine. In the future, you can use git rebase -i <thing> to remove them, (I just did that now).

(if enablePython then "--with-python=${python.interpreter}" else "--without-python")
(if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else "--without-icu")
] ++ optional (toolset != null) "--with-toolset=${toolset}";
] ++ optional enablePython "--with-python=${python.interpreter}"
Copy link
Member

Choose a reason for hiding this comment

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

Also n.b. the ] ++, despite the weird indent, is somewhat idiomatic.

@Ericson2314 Ericson2314 merged commit 93d3561 into NixOS:master Jan 3, 2018
@bnikolic bnikolic deleted the boostconfigurepythonfix branch January 3, 2018 22:14
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