diff --git a/docker/fedora39-pycv b/docker/fedora39-pycv index b3a3ad06bb..a9d1194d99 100644 --- a/docker/fedora39-pycv +++ b/docker/fedora39-pycv @@ -7,5 +7,5 @@ RUN source /etc/bashrc \ && cd plugins/pycv \ && pip3 install pybind11 \ && ln -s $(realpath ../../regtest/scripts) ./regtest/scripts \ - && ./prepareMakeForDevelop.sh \ + && python_bin=python3 ./prepareMakeForDevelop.sh \ && make check diff --git a/docker/rocky8-pycv b/docker/rocky8-pycv index 5b29e9c12d..3920b600bc 100644 --- a/docker/rocky8-pycv +++ b/docker/rocky8-pycv @@ -7,5 +7,5 @@ RUN source ./.bashrc \ && cd plugins/pycv \ && pip3 install --user pybind11 \ && ln -s $(realpath ../../regtest/scripts) ./regtest/scripts \ - && ./prepareMakeForDevelop.sh \ + && python_bin=python3 ./prepareMakeForDevelop.sh \ && make check diff --git a/plugins/pycv/prepareMakeForDevelop.sh b/plugins/pycv/prepareMakeForDevelop.sh index a83d537fc5..61a04e7c57 100755 --- a/plugins/pycv/prepareMakeForDevelop.sh +++ b/plugins/pycv/prepareMakeForDevelop.sh @@ -25,5 +25,5 @@ fi ${plumed_program_name} --no-mpi config makefile_conf echo "PLUMED_KERNEL=${PLUMED_KERNEL}" echo "ADDCPPFLAGS=$(${python_config} --cflags --embed) $(${python_bin} -m pybind11 --includes) -I$(${plumed_program_name} --no-mpi info --include-dir)/plumed" - echo "ADDCLDFLAGS=$(PYCV_EXTRA_LDFLAGS) $(${python_config} --ldflags --embed)" + echo "ADDCLDFLAGS=${PYCV_EXTRA_LDFLAGS} $(${python_config} --ldflags --embed)" } > Make.inc diff --git a/plugins/pycv/standaloneCompile.sh b/plugins/pycv/standaloneCompile.sh index c9dcb74a10..cb1966ccc5 100755 --- a/plugins/pycv/standaloneCompile.sh +++ b/plugins/pycv/standaloneCompile.sh @@ -27,7 +27,7 @@ fi #-fvisibility=hidden is needed to correct the warnings for the visibility of some pybind11 functionalities export PLUMED_MKLIB_CFLAGS="$(${python_config} --cflags --embed) $(python -m pybind11 --includes) -fvisibility=hidden" -export PLUMED_MKLIB_LDFLAGS="$(PYCV_EXTRA_LDFLAGS) $(${python_config} --ldflags --embed) $conda_fixup" +export PLUMED_MKLIB_LDFLAGS="${PYCV_EXTRA_LDFLAGS} $(${python_config} --ldflags --embed) $conda_fixup" echo PLUMED_MKLIB_CFLAGS=$PLUMED_MKLIB_CFLAGS echo PLUMED_MKLIB_LDFLAGS=$PLUMED_MKLIB_LDFLAGS