From b577984de6a0b5a962100269591d9df636486b5b Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 3 Oct 2016 00:34:42 +0200 Subject: [PATCH] Updated ZMQ --- install/build.ninja | 7 +++---- install/scripts/install_zmq.sh | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/install/build.ninja b/install/build.ninja index 351db7d..34ab4f7 100644 --- a/install/build.ninja +++ b/install/build.ninja @@ -7,15 +7,14 @@ URL_OPAM ="https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh" URL_IRPF90="https://github.com/scemama/irpf90/archive/v1.6.7.tar.gz" URL_EZFIO ="https://github.com/scemama/EZFIO/archive/v1.3.1.tar.gz" -URL_ZMQ ="http://download.zeromq.org/zeromq-4.0.7.tar.gz" -#URL_ZMQ ="http://download.zeromq.org/zeromq-4.1.3.tar.gz" -URL_F77ZMQ="https://github.com/scemama/f77_zmq/archive/v4.1.3.tar.gz" +URL_ZMQ ="http://download.zeromq.org/zeromq-4.1.4.tar.gz" +URL_F77ZMQ="https://github.com/scemama/f77_zmq/archive/4.1.4.tar.gz" # Rules ####### rule download - command = [[ -e ${out} ]] || (wget --no-check-certificate ${url} -O ${out}.tmp -o /dev/null && mv ${out}.tmp ${out}) + command = [ -e ${out} ] || (wget --no-check-certificate ${url} -O ${out}.tmp -o /dev/null && mv ${out}.tmp ${out}) description = Downloading ${descr} rule install diff --git a/install/scripts/install_zmq.sh b/install/scripts/install_zmq.sh index 80da3a3..6c7609c 100755 --- a/install/scripts/install_zmq.sh +++ b/install/scripts/install_zmq.sh @@ -3,7 +3,7 @@ TARGET=zmq function _install() { - LIBVERSION=4 + LIBVERSION=5 cd .. ; QMCCHEM_PATH="$PWD" ; cd - set +u export C_INCLUDE_PATH="${C_INCLUDE_PATH}":./ @@ -14,10 +14,10 @@ function _install() make -j 8 cd - rm -f -- "${QMCCHEM_PATH}"/lib/libzmq.{a,so,so.$LIBVERSION} -# cp "${BUILD}"/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/ -# cp "${BUILD}"/.libs/libzmq.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION - cp "${BUILD}"/src/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/ - cp "${BUILD}"/src/.libs/libzmq.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION + cp "${BUILD}"/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/ + cp "${BUILD}"/.libs/libzmq.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION +# cp "${BUILD}"/src/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/ +# cp "${BUILD}"/src/.libs/libzmq.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION cp "${BUILD}"/include/{zmq,zmq_utils}.h "${QMCCHEM_PATH}"/lib/ cd "${QMCCHEM_PATH}"/lib ln libzmq.so.$LIBVERSION libzmq.so || cp libzmq.so.$LIBVERSION libzmq.so