Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Plumed AlphaFold
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martin Kurečka
Plumed AlphaFold
Commits
3cb27aa2
There was an error fetching the commit references. Please try again later.
Commit
3cb27aa2
authored
5 years ago
by
Giovanni Bussi
Browse files
Options
Downloads
Patches
Plain Diff
Fix to allow finding indirect libraries on Linux
parent
f2dd1b83
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
conda/recipe/build.sh
+16
-8
16 additions, 8 deletions
conda/recipe/build.sh
conda/recipe/meta.yaml
+3
-0
3 additions, 0 deletions
conda/recipe/meta.yaml
with
19 additions
and
8 deletions
conda/recipe/build.sh
+
16
−
8
View file @
3cb27aa2
...
...
@@ -3,8 +3,7 @@
env
|
sort
# GB: install xdrfile library
if
false
;
then
# TG - disabling because it fails to link for no rational cause
if
true
;
then
wget http://ftp.gromacs.org/pub/contrib/xdrfile-1.1.4.tar.gz
tar
xzf xdrfile-1.1.4.tar.gz
cd
xdrfile-1.1.4
...
...
@@ -14,14 +13,23 @@ if false; then
cd
../
fi
# TG: The "disabled" features are workaround for possible
# conda+configure bugs in library search: building is ok but
# linking with the .so doesn't find them (in
# conda-forge). Possibly the LD path needs tweaks.
# TODO: install docs?
# TODO: re-enable them and see. Also to do: install docs?
# python wrapper is installed with pip
# we temporarily use internal lapack/blas (should probably be fixed)
# STATIC_LIBS is required on Linux for the following reason:
# When using env modules the dependent libraries can be found through the
# LD_LIBRARY_PATH or encoded configuring with -rpath.
# Conda does not use LD_LIBRARY_PATH and it is thus necessary to suggest where libraries are.
if
test
-n
"
$MACOSX_DEPLOYMENT_TARGET
"
;
then
opt
=
""
else
opt
=
STATIC_LIBS
=
-Wl
,-rpath-link,
$PREFIX
/lib
fi
./configure
--prefix
=
$PREFIX
--enable-shared
--disable-python
--disable-external-lapack
--disable-external-blas
$opt
./configure
--prefix
=
$PREFIX
--enable-shared
--disable-python
--disable-zlib
--disable-external-lapack
--disable-external-blas
make
-j4
make
install
...
...
This diff is collapsed.
Click to expand it.
conda/recipe/meta.yaml
+
3
−
0
View file @
3cb27aa2
...
...
@@ -43,6 +43,8 @@ requirements:
-
pip
-
cython
-
zlib
# cannot link gsl on MacOS
-
gsl
# [linux]
-
m2w64-binutils
# [win]
-
m2w64-gcc
# [win]
-
m2w64-tools-git
# [win]
...
...
@@ -50,6 +52,7 @@ requirements:
run
:
-
python
-
zlib
-
gsl
# [linux]
test
:
# TODO. In principle these could be the official regtests.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment