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

Build OSX with Cmake #18

Merged
merged 21 commits into from
Jan 25, 2020
Merged

Build OSX with Cmake #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
824af51
Add fake cc1 to workaround issue 11 in gfortran_osx-64
jaimergp Jan 14, 2020
3c49c52
Enable osx
jaimergp Jan 14, 2020
84ed44b
Don't manually export FFLAGS for now
jaimergp Jan 14, 2020
20fdb43
MNT: Re-rendered with conda-build 3.18.11, conda-smithy 3.6.5, and co…
conda-forge-admin Jan 20, 2020
eacac6a
Merge branch 'cmake-osx' of github.com:jaimergp/ambertools-feedstock …
jaimergp Jan 14, 2020
a07762b
Patch deployment target override
jaimergp Jan 24, 2020
847c777
Try to fix weird xdrfile/VERSION accidental import
jaimergp Jan 24, 2020
12fdb2d
Dirty workaround tk/X11 conflicts
jaimergp Jan 24, 2020
b54e28c
Disable unbound variable checks temporarily
jaimergp Jan 24, 2020
8371ad1
Maybe we only need to make sure xorg-* libs are installed last
jaimergp Jan 24, 2020
65bc6db
Handle eux options
jaimergp Jan 24, 2020
aed893c
Forc remove tk entirely :fingers_crossed:
jaimergp Jan 24, 2020
e928444
Delete xdrfile/version instead of commenting out
jaimergp Jan 24, 2020
79abd57
Do not require X11 deps in OSX
jaimergp Jan 24, 2020
e933ba2
Be a less restrictive with X11 deps in osx
jaimergp Jan 24, 2020
ea4eec2
Remove commented out code
jaimergp Jan 24, 2020
7d7000b
libx11 is pulled by other X libs already
jaimergp Jan 24, 2020
fc6927a
libopenblas not needed
jaimergp Jan 24, 2020
dae7585
Do not build GUI in OSX for now
jaimergp Jan 24, 2020
1de165f
Xorg libs not needed in OSX for now
jaimergp Jan 24, 2020
1000d9d
Bump up build number
jaimergp Jan 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ source:
- patches/do_not_use_global_conda_prefix.patch
- patches/do_not_symlink_missing_ff12pol.patch
- patches/use_external_netcdf.patch
- patches/do_not_override_osx_deployment_target.patch
- patches/do_not_override_osx_deployment_target.patch # [osx]
# Fix weird bug described here:
# https://github.com/conda-forge/ambertools-feedstock/pull/11#issuecomment-570618741
- patches/comment_out_xdrfile_version.patch # [osx]
# The following patch was downloaded from this GH issue:
# https://github.com/Amber-MD/cmake-buildscripts/issues/131#issuecomment-561280272
# It needs to be applied manually in build.sh
Expand Down
7 changes: 7 additions & 0 deletions recipe/patches/comment_out_xdrfile_version.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
diff --git a/AmberTools/src/cpptraj/src/xdrfile/VERSION b/AmberTools/src/cpptraj/src/xdrfile/VERSION
index 8926873d..213b6891 100644
--- a/AmberTools/src/cpptraj/src/xdrfile/VERSION
+++ b/AmberTools/src/cpptraj/src/xdrfile/VERSION
jaimergp marked this conversation as resolved.
Show resolved Hide resolved
@@ -1 +1 @@
-Code is from MDTRAJ (https://github.com/mdtraj/mdtraj), commit aa1c91f3ab6b0f9e9f1d0c790d2b5bff7c83ece4
+// Code is from MDTRAJ (https://github.com/mdtraj/mdtraj), commit aa1c91f3ab6b0f9e9f1d0c790d2b5bff7c83ece4