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

Jump to bottom

opencsg: Darwin support and tidy #61088

Merged
merged 1 commit into from May 8, 2019
Merged

opencsg: Darwin support and tidy #61088

merged 1 commit into from May 8, 2019

Conversation

thefloweringash
Copy link
Member

Regenerate the Makefiles using qmake to set the correct compiler and
use the default installPhase.

Motivation for this change

Working towards building openscad for Darwin.

The install name handling here is rather unpleasant. The library is ultimately corrected in the fixup phase by the hook, however the example application is already linked by then. Suggestions for improvement welcome.

Things done
  • 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.

@thefloweringash
opencsg: Darwin support and tidy
29a7e22 
Regenerate the Makefiles using qmake to set the correct compiler and
use the default installPhase.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 7, 2019
@thefloweringash
Copy link
Member Author

Patch sent upstream as floriankirsch/OpenCSG#2

@ofborg ofborg bot requested a review from 7c6f434c May 7, 2019 14:38
@7c6f434c
Copy link
Member

7c6f434c commented May 7, 2019

@GrahamcOfBorg build openscad

@thefloweringash
Copy link
Member Author

@7c6f434c this only fixes opencsg. openscad needs a little more work.

@7c6f434c
Copy link
Member

7c6f434c commented May 8, 2019

I just wanted to check that rerunning qmake doesn't have any side-effects that OpenSCAD would care about.

@7c6f434c 7c6f434c merged commit 71f9786 into NixOS:master May 8, 2019
@thefloweringash thefloweringash deleted the opencsg-darwin branch May 8, 2019 03:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: package (new) 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
2 participants
@thefloweringash @7c6f434c