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

palp: Add darwin support #44829

Merged
merged 1 commit into from Aug 9, 2018
Merged

palp: Add darwin support #44829

merged 1 commit into from Aug 9, 2018

Conversation

jbaum98
Copy link
Contributor

@jbaum98 jbaum98 commented Aug 9, 2018

Motivation for this change

Adds the ability to build palp on darwin.

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 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.

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Aug 9, 2018
@jbaum98
Copy link
Contributor Author

jbaum98 commented Aug 9, 2018

Sorry @basvandijk, @peti, and @ryantm, there was a rebase issue and commits of yours were temporarily pulled in. Fixed now, but you still got pinged.

LnL7
LnL7 approved these changes Aug 9, 2018
View reviewed changes
pkgs/applications/science/math/palp/darwin.patch Outdated


-CC=gcc
+CC=cc
Copy link
Member

Choose a reason for hiding this comment

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

I'd use substituteInPlace instead of a patch, it's pretty safe in this case and more likely to continue working in the future.

@jbaum98
Copy link
Contributor Author

jbaum98 commented Aug 9, 2018

I used substituteInPlace, but one thing I still don't understand is why there is another makefile called Makefile that already has cc=CC, but also has other changes that make it not produce all the files that installPhase expects.

@LnL7
Copy link
Member

LnL7 commented Aug 9, 2018

@GrahamcOfBorg build palp

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: palp

Partial log (click to expand)

shrinking /nix/store/ridl42nwzkj5bcfln4ii8m1ybkxa2kjb-palp-6d-2.1/bin/mori-6d.x
shrinking /nix/store/ridl42nwzkj5bcfln4ii8m1ybkxa2kjb-palp-6d-2.1/bin/nef-6d.x
shrinking /nix/store/ridl42nwzkj5bcfln4ii8m1ybkxa2kjb-palp-6d-2.1/bin/poly-6d.x
shrinking /nix/store/ridl42nwzkj5bcfln4ii8m1ybkxa2kjb-palp-6d-2.1/bin/cws-6d.x
shrinking /nix/store/ridl42nwzkj5bcfln4ii8m1ybkxa2kjb-palp-6d-2.1/bin/class-6d.x
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ridl42nwzkj5bcfln4ii8m1ybkxa2kjb-palp-6d-2.1/bin 
patching script interpreter paths in /nix/store/ridl42nwzkj5bcfln4ii8m1ybkxa2kjb-palp-6d-2.1
checking for references to /tmp/nix-build-palp-6d-2.1.drv-0 in /nix/store/ridl42nwzkj5bcfln4ii8m1ybkxa2kjb-palp-6d-2.1...
/nix/store/ridl42nwzkj5bcfln4ii8m1ybkxa2kjb-palp-6d-2.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: palp

Partial log (click to expand)

shrinking /nix/store/qkwxwkjv2g5vxygrmc6kzcl82zgz4v31-palp-6d-2.1/bin/mori-6d.x
shrinking /nix/store/qkwxwkjv2g5vxygrmc6kzcl82zgz4v31-palp-6d-2.1/bin/nef-6d.x
shrinking /nix/store/qkwxwkjv2g5vxygrmc6kzcl82zgz4v31-palp-6d-2.1/bin/cws-6d.x
shrinking /nix/store/qkwxwkjv2g5vxygrmc6kzcl82zgz4v31-palp-6d-2.1/bin/class-6d.x
shrinking /nix/store/qkwxwkjv2g5vxygrmc6kzcl82zgz4v31-palp-6d-2.1/bin/poly-6d.x
strip is /nix/store/ah0va6j4cnwj9nx4j6rwcfc8nh785jwm-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qkwxwkjv2g5vxygrmc6kzcl82zgz4v31-palp-6d-2.1/bin
patching script interpreter paths in /nix/store/qkwxwkjv2g5vxygrmc6kzcl82zgz4v31-palp-6d-2.1
checking for references to /build in /nix/store/qkwxwkjv2g5vxygrmc6kzcl82zgz4v31-palp-6d-2.1...
/nix/store/qkwxwkjv2g5vxygrmc6kzcl82zgz4v31-palp-6d-2.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: palp

Partial log (click to expand)

                                                      ^
1 warning generated.
cc -O3 -g -W -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -o mori.x mori.o Coord.o Rat.o Vertex.o Polynf.o MoriCone.o SingularInput.o LG.o
running tests
installing
post-installation fixup
strip is /nix/store/251fvx4mx9q4zarbca5cciasmn66p668-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/slldys7n0h1nbdr00q3mqxhacvl3ryfc-palp-6d-2.1/bin
patching script interpreter paths in /nix/store/slldys7n0h1nbdr00q3mqxhacvl3ryfc-palp-6d-2.1
/nix/store/slldys7n0h1nbdr00q3mqxhacvl3ryfc-palp-6d-2.1

@xeji xeji merged commit 3babbaa into NixOS:master Aug 9, 2018
@jbaum98 jbaum98 deleted the palp branch August 9, 2018 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 approved these changes

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
4 participants
@jbaum98 @LnL7 @GrahamcOfBorg @xeji