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

z3: fix darwin build #43526

Merged
merged 1 commit into from Jul 14, 2018
Merged

z3: fix darwin build #43526

merged 1 commit into from Jul 14, 2018

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Jul 14, 2018

Motivation for this change

cc: @thoughtpolice as commiter of 54e9f7d

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 Jul 14, 2018
LnL7
LnL7 reviewed Jul 14, 2018
View reviewed changes
pkgs/applications/science/logic/z3/default.nix
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
mv $out/lib $lib/lib
mv $out/include $dev/include

# clean up a copy of libz3.so and symlink it instead
rm $python/${python.sitePackages}/z3/lib/libz3.so
ln -s $lib/lib/libz3.so $python/${python.sitePackages}/z3/lib/libz3.so
Copy link
Member

Choose a reason for hiding this comment

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

We have hostPlatform.extensions.sharedLibrary to handle conditional like this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍 updated

@marsam marsam force-pushed the feature/z3-fix-darwin-build branch from 3c2b69f to 43751fc Compare July 14, 2018 15:15
@xeji
Copy link
Contributor

xeji commented Jul 14, 2018

@GrahamcOfBorg build z3

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: z3

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/572084yw3jim8qsqfvdxy9jmyvjd1vz0-z3-4.7.1-dev
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/572084yw3jim8qsqfvdxy9jmyvjd1vz0-z3-4.7.1-dev
checking for references to /build in /nix/store/572084yw3jim8qsqfvdxy9jmyvjd1vz0-z3-4.7.1-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/ah5b6pr24gpiqvas4rvmq686anwhbm17-z3-4.7.1-python
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ah5b6pr24gpiqvas4rvmq686anwhbm17-z3-4.7.1-python/lib
patching script interpreter paths in /nix/store/ah5b6pr24gpiqvas4rvmq686anwhbm17-z3-4.7.1-python
checking for references to /build in /nix/store/ah5b6pr24gpiqvas4rvmq686anwhbm17-z3-4.7.1-python...
/nix/store/rw72vwhjnpjvcq5z8rrzwagqgpn99jxf-z3-4.7.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: z3

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/g7vjpc043wswcykwy0lcg5y7fhcfxmsv-z3-4.7.1-dev
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/g7vjpc043wswcykwy0lcg5y7fhcfxmsv-z3-4.7.1-dev
checking for references to /build in /nix/store/g7vjpc043wswcykwy0lcg5y7fhcfxmsv-z3-4.7.1-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/r433s3v17k2szcq52hfdhaqpffpqi3pc-z3-4.7.1-python
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/r433s3v17k2szcq52hfdhaqpffpqi3pc-z3-4.7.1-python/lib
patching script interpreter paths in /nix/store/r433s3v17k2szcq52hfdhaqpffpqi3pc-z3-4.7.1-python
checking for references to /build in /nix/store/r433s3v17k2szcq52hfdhaqpffpqi3pc-z3-4.7.1-python...
/nix/store/vidw2xi682zj9y2qqpp8jhn5m5zi6797-z3-4.7.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: z3

Partial log (click to expand)

strip is /nix/store/7ddbq63v97nk8gkbf7gcsfmby37h6gbl-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/gq8zj0d9wrp5gzyhlzpibppqp63ygi3i-z3-4.7.1-lib/lib
patching script interpreter paths in /nix/store/gq8zj0d9wrp5gzyhlzpibppqp63ygi3i-z3-4.7.1-lib
/nix/store/gq8zj0d9wrp5gzyhlzpibppqp63ygi3i-z3-4.7.1-lib/lib/libz3.dylib: fixing dylib
strip is /nix/store/7ddbq63v97nk8gkbf7gcsfmby37h6gbl-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/5d4h8aaqqjcwfim8f2xnv8snjfgz5w1f-z3-4.7.1-dev
strip is /nix/store/7ddbq63v97nk8gkbf7gcsfmby37h6gbl-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/p7sm6bvhlf3275k9dp3pqfx56p7dysz5-z3-4.7.1-python/lib
patching script interpreter paths in /nix/store/p7sm6bvhlf3275k9dp3pqfx56p7dysz5-z3-4.7.1-python
/nix/store/32gg8gzy2fzkjcrnrvmamxgvsd7av68q-z3-4.7.1

@xeji xeji merged commit 1c88d0c into NixOS:master Jul 14, 2018
@marsam marsam deleted the feature/z3-fix-darwin-build branch July 14, 2018 20:20
@thoughtpolice
Copy link
Member

thoughtpolice commented Jul 15, 2018 •
edited

Ah, sorry about that @marsam! I was away yesterday.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 left review comments

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@marsam @xeji @GrahamcOfBorg @thoughtpolice @LnL7