From f9eeb6ebad50f323c5a9f0d948f4346fcc938f7e Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Sun, 12 May 2019 21:51:20 +0200
Subject: [PATCH] small fixes
---
conda/py-plumed/meta.yaml | 8 +++-----
conda/recipe/build.sh | 2 ++
conda/recipe/meta.yaml | 10 +---------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/conda/py-plumed/meta.yaml b/conda/py-plumed/meta.yaml
index 1331a2be8..e990bdb50 100644
--- a/conda/py-plumed/meta.yaml
+++ b/conda/py-plumed/meta.yaml
@@ -11,18 +11,16 @@ source:
build:
number: 0
skip: True # [win]
- # Note: --no-deps is currently required due to https://github.com/conda/conda-build/issues/3254
- # Once resolved, it should be removed.
- # script: "{{ PYTHON }} -m pip install . --no-deps -vv"
requirements:
+ build:
+ - {{ compiler('c') }}
+ - {{ compiler('cxx') }}
host:
- python
- pip
- cython
-
run:
-# make sure to test with this version
- python
test:
diff --git a/conda/recipe/build.sh b/conda/recipe/build.sh
index f3c6f1f0c..fc1c13d21 100644
--- a/conda/recipe/build.sh
+++ b/conda/recipe/build.sh
@@ -28,6 +28,8 @@ else
opt=STATIC_LIBS=-Wl,-rpath-link,$PREFIX/lib
fi
+export CPPFLAGS="-D__PLUMED_DEFAULT_KERNEL=$PREFIX/lib/libplumedKernel$SHLIB_EXT $CPPFLAGS"
+
./configure --prefix=$PREFIX --enable-shared --disable-python --disable-external-lapack --disable-external-blas $opt
make -j4
diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml
index ae9c4085a..dadffe837 100644
--- a/conda/recipe/meta.yaml
+++ b/conda/recipe/meta.yaml
@@ -7,28 +7,19 @@ package:
source:
path: ../..
- # Tar is preferred, but a symlink therein crashes windows builds. Git is ok.
- # url: https://github.com/plumed/{{ name }}/archive/v{{ version }}.tar.gz
- # sha256: f4cf55c63a6798a0607f4e47eeeee7c1bc191668772c83ce4dabf3a5ba407426
build:
number: 0
skip: True # [win]
- skip: True # [py<35]
- # Note: --no-deps is currently required due to https://github.com/conda/conda-build/issues/3254
- # Once resolved, it should be removed.
- # script: "{{ PYTHON }} -m pip install . --no-deps -vv"
requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
-# - ccache-toolchain
host:
- zlib
# cannot link gsl on MacOS
- gsl # [linux]
-
run:
- zlib
- gsl # [linux]
@@ -39,6 +30,7 @@ test:
- plumed info --root
- plumed info --version
- plumed info --long-version
+ - $PREFIX/lib/plumed/plumed-runtime -h
about:
home: http://www.plumed.org/
--
GitLab