Skip to content

Merge pull request #75 from eunos-1128/master #80

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

Merged
merged 6 commits into from
Jun 12, 2025
Merged

Merge pull request #75 from eunos-1128/master #80

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1dc3166
Merge pull request #75 from eunos-1128/master
eunos-1128 Jun 8, 2025
86457f5
Update io.github.pemsley.coot.yaml
eunos-1128 Jun 11, 2025
3df6add
Update io.github.pemsley.coot.yaml
eunos-1128 Jun 11, 2025
b1de58f
Merge pull request #78 from eunos-1128/master
eunos-1128 Jun 11, 2025
6a9ad83
Merge branch 'master' into beta
eunos-1128 Jun 12, 2025
50110fc
Merge branch 'beta' into alpha
eunos-1128 Jun 12, 2025
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
26 changes: 18 additions & 8 deletions io.github.pemsley.coot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ modules:
config-opts:
- -DUSE_PYTHON=1
- -DPYTHON_INSTALL_DIR=/app/lib/python3.12/site-packages
build-options:
cxxflags: "-fPIC -O2"
sources:
- type: git
url: https://github.com/project-gemmi/gemmi.git
Expand All @@ -42,6 +44,8 @@ modules:
- --enable-shared
- --enable-float
- --disable-static
build-options:
cflags: "-fPIC -O3"
sources:
- type: archive
url: https://fftw.org/fftw-2.1.5.tar.gz
Expand All @@ -57,7 +61,7 @@ modules:
- --enable-shared
- --disable-static
build-options:
cxxflags: "-g -O2"
cxxflags: "-g -O2 -fPIC -std=c++11"
sources:
- type: archive
url: https://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/dependencies/mmdb2-2.0.22.tar.gz
Expand All @@ -69,6 +73,9 @@ modules:
- --enable-shared
- --disable-static
- --disable-fortran
build-options:
cflags: "-fPIC -O2"
cxxflags: "-fPIC -O2"
sources:
- type: archive
url: https://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/dependencies/libccp4-8.0.0.tar.gz
Expand All @@ -85,7 +92,7 @@ modules:
- --enable-shared
- --disable-static
build-options:
cxxflags: "-g -O2 -fno-strict-aliasing -Wno-narrowing"
cxxflags: "-g -O2 -fno-strict-aliasing -Wno-narrowing -fPIC -std=c++11"
sources:
- type: archive
url: https://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/dependencies/clipper-2.1.20180802.tar.gz
Expand All @@ -111,7 +118,7 @@ modules:
- name: raster3d
buildsystem: simple
build-options:
cxxflags: "-g -O2 -fno-strict-aliasing -Wno-narrowing"
cxxflags: "-g -O2 -fno-strict-aliasing -Wno-narrowing -fPIC"
build-commands:
- make linux
- make all
Expand Down Expand Up @@ -181,12 +188,13 @@ modules:
buildsystem: cmake-ninja
builddir: true
config-opts:
- -DDYNAMIC_ARCH=1
- -DUSE_OPENMP=1
- -DNUM_THREADS=56
- -DNO_SVE=1
- -DUSE_OPENMP=ON
- -DNUM_THREADS=64
- -DNO_SVE=ON
- -DBUILD_SHARED_LIBS=ON
- -DDYNAMIC_ARCH=ON
build-options:
cflags: "-fPIC -O3"
post-install:
- ln -s /app/lib/libopenblas.so /app/lib/libblas.so
- ln -s /app/lib/libopenblas.so /app/lib/liblapack.so
Expand All @@ -201,6 +209,8 @@ modules:
- --disable-debug
- --disable-docs
- --disable-dependency-tracking
build-options:
cflags: "-fPIC -O2"
sources:
- type: git
url: https://github.com/ivmai/bdwgc
Expand Down Expand Up @@ -329,7 +339,7 @@ modules:
- --with-backward
- --with-libdw
build-options:
cxxflags: "-g -O1"
cxxflags: "-g -O1 -fPIC"
env:
GLM_CFLAGS: "-I/app/include"
GLM_LIBS: "-L/app/lib -lglm"
Expand Down