diff --git a/macports/Portfile.in b/macports/Portfile.in index b3ceeae7a283fbedfc9c4e89aa951932c05d86a5..9743b0fb8af0e63b84e3a5ba2d102af047a4c5ed 100644 --- a/macports/Portfile.in +++ b/macports/Portfile.in @@ -83,7 +83,7 @@ depends_lib-append port:xdrfile port:zlib port:gsl # Notice that one of the optional modules (drr) requires boost_serialization variant allmodules description {Enable all optional modules} { configure.args-append --enable-modules=all --enable-boost-serialization - configure.ldflags-append -lboost_serialization + configure.ldflags-append -lboost_serialization-mt depends_lib-append port:boost } diff --git a/regtest/drr/rt-extract/config b/regtest/drr/rt-extract/config index 6757d601ee4bf1142b95deb0387e289cae4a728f..1d9385ecdf60f22129f9daa3dcf110f870c5266e 100644 --- a/regtest/drr/rt-extract/config +++ b/regtest/drr/rt-extract/config @@ -2,14 +2,3 @@ type=plumed plumed_needs=boost_serialization plumed_modules=drr arg="drr_tool --extract test.drrstate -v" - -# Skip this since it crashes on travis-ci -# I'm not sure about the reason, could be the boost version of macports -function plumed_custom_skip(){ - if [ "$(uname)" == "Darwin" ] ; then - return 0 - else - return 1 - fi -} - diff --git a/regtest/drr/rt-merge/config b/regtest/drr/rt-merge/config index 024e9cfafe4be808201a745e39b784c0c1467dad..94f2c07798c6ef398f13b19b517dc7acaa6d16c1 100644 --- a/regtest/drr/rt-merge/config +++ b/regtest/drr/rt-merge/config @@ -1,10 +1,3 @@ -function plumed_custom_skip(){ - if [ "$(uname)" == "Darwin" ] ; then - return 0 - else - return 1 - fi -} type=plumed plumed_needs=boost_serialization plumed_modules=drr diff --git a/regtest/drr/rt-restart/config b/regtest/drr/rt-restart/config index a7643ff6afe2fd0481fb10385d125ef4d747e2c4..9d401dbeeb7e08e90615e50b59941bf0fa83c10e 100644 --- a/regtest/drr/rt-restart/config +++ b/regtest/drr/rt-restart/config @@ -2,10 +2,3 @@ type=driver plumed_needs=boost_serialization plumed_modules=drr arg="--plumed plumed.dat --trajectory-stride 1 --timestep 0.005 --ixyz ala12_trajectory.xyz --dump-forces forces --dump-forces-fmt=%10.6f" -function plumed_custom_skip(){ - if [ "$(uname)" == "Darwin" ] ; then - return 0 - else - return 1 - fi -}