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

leocad: 17.02 -> 17.07 #33193

Merged
merged 1 commit into from Dec 30, 2017
Merged

leocad: 17.02 -> 17.07 #33193

merged 1 commit into from Dec 30, 2017

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Dec 30, 2017

Motivation for this change

Release notes: https://github.com/leozide/leocad/releases/tag/v17.07

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.

@lukateras lukateras self-requested a review December 30, 2017 00:46
@lukateras
Copy link
Member

@GrahamcOfBorg build leocad

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

source root is source
patching sources
configuring
sh: g++: command not found
qmake4Hook: enabled parallel building
building
build flags: -j1 -l1 SHELL=/nix/store/hiv85an0qyzj6ps88f5pvkbbdj8238nj-bash-4.4-p12/bin/bash
make: *** No rule to make target '/private/tmp/nix-build-leocad-17.07.drv-0/source/library.bin', needed by 'build/release/LeoCAD.app/Contents/Resources/library.bin'.  Stop.
builder for ‘/nix/store/lpcpvpl5h9bfsamn4lbw2i7p7fwsh1xy-leocad-17.07.drv’ failed with exit code 2
error: build of ‘/nix/store/lpcpvpl5h9bfsamn4lbw2i7p7fwsh1xy-leocad-17.07.drv’ failed

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

install -m 644 -p /tmp/nix-build-leocad-17.07.drv-0/source/resources/application-vnd.leocad.svg /nix/store/bgz5blp5qrl766zhr7d2614sjx4r5syd-leocad-17.07/share/icons/hicolor/scalable/mimetypes/
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/bgz5blp5qrl766zhr7d2614sjx4r5syd-leocad-17.07
shrinking /nix/store/bgz5blp5qrl766zhr7d2614sjx4r5syd-leocad-17.07/bin/leocad
gzipping man pages under /nix/store/bgz5blp5qrl766zhr7d2614sjx4r5syd-leocad-17.07/share/man/
stripping (with flags -S) in /nix/store/bgz5blp5qrl766zhr7d2614sjx4r5syd-leocad-17.07/bin 
patching script interpreter paths in /nix/store/bgz5blp5qrl766zhr7d2614sjx4r5syd-leocad-17.07
checking for references to /tmp/nix-build-leocad-17.07.drv-0 in /nix/store/bgz5blp5qrl766zhr7d2614sjx4r5syd-leocad-17.07...
/nix/store/bgz5blp5qrl766zhr7d2614sjx4r5syd-leocad-17.07

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

install -m 644 -p /build/source/resources/application-vnd.leocad.svg /nix/store/g67zkby6mmqd6sivsxk373jj0xj8yxk5-leocad-17.07/share/icons/hicolor/scalable/mimetypes/
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/g67zkby6mmqd6sivsxk373jj0xj8yxk5-leocad-17.07
shrinking /nix/store/g67zkby6mmqd6sivsxk373jj0xj8yxk5-leocad-17.07/bin/leocad
gzipping man pages under /nix/store/g67zkby6mmqd6sivsxk373jj0xj8yxk5-leocad-17.07/share/man/
stripping (with flags -S) in /nix/store/g67zkby6mmqd6sivsxk373jj0xj8yxk5-leocad-17.07/bin
patching script interpreter paths in /nix/store/g67zkby6mmqd6sivsxk373jj0xj8yxk5-leocad-17.07
checking for references to /build in /nix/store/g67zkby6mmqd6sivsxk373jj0xj8yxk5-leocad-17.07...
/nix/store/g67zkby6mmqd6sivsxk373jj0xj8yxk5-leocad-17.07

@lukateras
Copy link
Member

I think this is reasonable, given that it's just a version bump, but patching Makefile to refer to c++ rather than g++ would make it build on Darwin.

@lukateras lukateras merged commit 6afafd6 into NixOS:master Dec 30, 2017
@lukateras
Copy link
Member

I'll fix that myself. Thank you!

@lukateras
Copy link
Member

It seems to be more complicated than that, qmake file has set platform to build for (linux-g++), so no Darwin build :-(

@dtzWill
Copy link
Member Author

dtzWill commented Dec 30, 2017

:(

Just to understand how :( this is, did leocad previously build/work on Darwin?

FWIW we might want to move this to qt5, since it appears to support that and general Nix trend is to prefer Qt5 when both are available.

@lukateras
Copy link
Member

It never did. I think the problem starts here: https://github.com/leozide/leocad/blob/41c342f46f4e445caa8cf65f3151c51ed401782a/leocad.spec#L181

GCC is also hardcoded in few other places. Yeah, Qt5 would be much better!

@dtzWill
Copy link
Member Author

dtzWill commented Dec 30, 2017

@yegortimoshenko I think .spec is unrelated, only used for RPM builds?

The [leocad.pro file](https://github.com/leozide/leocad/blob/41c342f46f4e445caa8cf65f3151c51ed401782a/leocad.pro#L30) mentions g++... but only when using qt4 (?!) ?

So maybe qt5 will solve all our problems? hopeful face

@lukateras
Copy link
Member

lukateras commented Dec 30, 2017

Oh, you are right, that's probably what fails. But then when I tried to change it to c++, build failed anyway, after transpiling some .moc files. Generated Makefile had multiple g++ mentions.

Perhaps! But having something to build on Darwin is not critical.

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