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

slic3r: patch to fix compile error if Boost > 1.55 #74251

Merged
merged 1 commit into from Nov 27, 2019
Merged

slic3r: patch to fix compile error if Boost > 1.55 #74251

merged 1 commit into from Nov 27, 2019

Conversation

marcus7070
Copy link
Member

@marcus7070 marcus7070 commented Nov 26, 2019 •
edited

Motivation for this change

Compile error in Slic3r #74250

Patch is currently commented out (ie. this PR is currently equivalent to master), because I want to see it fail on the bot's build.

@GrahamcOfBorg build slic3r

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 rev HEAD"
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @bjornfor @the-kenny

@marcus7070
Copy link
Member Author

So with my patch commented out (ie. testing the master code), the ofborg bot passed all checks.

So I got a #nixos IRC channel user to test slic3r from master and they were able to reproduce the error, so I guess I'm not using the bot correctly.

Gotta run right now, but I'll force push the correct PR in a few hours.

@marcus7070
Copy link
Member Author

marcus7070 commented Nov 26, 2019 •
edited

For bonus marks, I think I should:

  • Figure out what versions of Boost require this patch
  • Add a conditional and only apply the patch if needed
  • Test with different versions of Boost

I'm also open to advice on if a patch is the appropriate way to fix this, or should I be taking a later commit from the Slic3r repo where they have fixed it (but note there is no proper release with the fix included).

@ofborg ofborg bot requested review from the-kenny and bjornfor November 26, 2019 10:05
@marcus7070
Copy link
Member Author

Boost 1.55 has noncopyablein the main namespace, Boost 1.56 has it in Boost.Core.

@marcus7070
Copy link
Member Author

Both nix-build -A slic3r and nix-build -E 'with (import ./default.nix {}); slic3r.override { boost = boost155; }' build and run now. I think this is ready to merge.

@marcus7070 marcus7070 changed the title [WIP] slic3r: patch to fix compile error slic3r: patch to fix compile error if Boost > 1.55 Nov 27, 2019
@bjornfor bjornfor merged commit 4692b6e into NixOS:master Nov 27, 2019
@marcus7070 marcus7070 deleted the marcus7070/slic3r-fix-compile branch November 27, 2019 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjornfor bjornfor bjornfor approved these changes

@the-kenny the-kenny Awaiting requested review from the-kenny

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@marcus7070 @bjornfor