From c6dd986ad2f1cd7f7b9da847a61811a518ea10dc Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Wed, 25 Nov 2015 13:57:40 +0100
Subject: [PATCH] ZeroMQ installation OK

---
 configure                              | 19 ++++++++++---------
 install/scripts/install_f77zmq.sh      | 10 +++++-----
 install/scripts/install_zeromq.sh      |  5 +++--
 scripts/compilation/qp_create_ninja.py |  3 ++-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index 8376940d..c0925a78 100755
--- a/configure
+++ b/configure
@@ -46,6 +46,7 @@ if len(sys.argv) != 3:
 
 QP_ROOT = os.getcwd()
 QP_ROOT_BIN = join(QP_ROOT, "bin")
+QP_ROOT_LIB = join(QP_ROOT, "lib")
 QP_ROOT_INSTALL = join(QP_ROOT, "install")
 
 os.environ["PATH"] = os.environ["PATH"] + ":" + QP_ROOT_BIN
@@ -95,12 +96,12 @@ curl = Info(
 zlib = Info(
     url='http://zlib.net/zlib-1.2.8.tar.gz',
     description=' zlib',
-    default_path=join(QP_ROOT_INSTALL, "zlib"))
+    default_path=join(QP_ROOT_LIB, "libz.a"))
 
-path = Info(
+patch = Info(
     url='ftp://ftp.gnu.org/gnu/patch/patch-2.7.5.tar.gz',
-    description=' path',
-    default_path=join(QP_ROOT, "lib", "libz.a"))
+    description=' patch',
+    default_path=join(QP_ROOT_BIN, "patch"))
 
 irpf90 = Info(
     url='{head}/LCPQ/irpf90/{tail}'.format(**path_github),
@@ -119,7 +120,7 @@ resultsFile = Info(
 
 ninja = Info(
     url='{head}/martine/ninja/{tail}'.format(**path_github),
-    description=' nina',
+    description=' ninja',
     default_path=join(QP_ROOT_BIN, "ninja"))
 
 emsl = Info(
@@ -135,12 +136,12 @@ ezfio = Info(
 zeromq = Info(
     url='http://download.zeromq.org/zeromq-4.1.3.tar.gz',
     description=' ZeroMQ',
-    default_path=join(QP_ROOT_INSTALL, "zeromq"))
+    default_path=join(QP_ROOT_LIB, "libzmq.a"))
 
 f77zmq = Info(
-    url='{head}/zeromq/f77zmq/{tail}'.format(**path_github),
+    url='{head}/zeromq/f77_zmq/{tail}'.format(**path_github),
     description=' F77-ZeroMQ',
-    default_path=join(QP_ROOT_INSTALL, "f77zmq"))
+    default_path=join(QP_ROOT_LIB, "libf77zmq.a"))
 
 p_graphviz = Info(
     url='https://github.com/xflr6/graphviz/archive/master.tar.gz',
@@ -149,7 +150,7 @@ p_graphviz = Info(
 
 d_info = dict()
 
-for m in ["ocaml", "m4", "curl", "zlib", "path", "irpf90", "docopt",
+for m in ["ocaml", "m4", "curl", "zlib", "patch", "irpf90", "docopt",
           "resultsFile", "ninja", "emsl", "ezfio", "p_graphviz",
           "zeromq", "f77zmq" ]:
     exec ("d_info['{0}']={0}".format(m))
diff --git a/install/scripts/install_f77zmq.sh b/install/scripts/install_f77zmq.sh
index afbd03ca..e8d592e1 100755
--- a/install/scripts/install_f77zmq.sh
+++ b/install/scripts/install_f77zmq.sh
@@ -4,14 +4,14 @@ TARGET=f77zmq
 
 function _install()
 {
+  export C_INCLUDE_PATH="${C_INCLUDE_PATH}":"${QP_ROOT}"/lib
   set -e
   set -u
-  export C_INCLUDE_PATH="${C_INCLUDE_PATH}":"${QP_ROOT}"/lib
-  export ZMQ_H=$PWD/zmq.h
+  export ZMQ_H="${QP_ROOT}"/lib/zmq.h
   cd "${BUILD}"
-  make -j 8 
-  mv libf77zmq.a "${QP_ROOT}"/lib
-  mv libf77zmq.so "${QP_ROOT}"/lib
+  make -j 8                        || exit 1
+  mv libf77zmq.a "${QP_ROOT}"/lib  || exit 1
+  mv libf77zmq.so "${QP_ROOT}"/lib || exit 1
   cd -
   return 0
 }
diff --git a/install/scripts/install_zeromq.sh b/install/scripts/install_zeromq.sh
index 0e36d46c..5ea280a7 100755
--- a/install/scripts/install_zeromq.sh
+++ b/install/scripts/install_zeromq.sh
@@ -7,16 +7,17 @@ function _install()
   export C_INCLUDE_PATH="${C_INCLUDE_PATH}":./
   set -e
   set -u
+  ORIG=$(pwd)
   cd "${BUILD}"
   ./configure --without-libsodium || exit 1
   make -j 8 || exit 1
-  rm -f -- ../lib/libzmq.a ../lib/libzmq.so ../lib/libzmq.so.5
+  rm -f -- "${QP_ROOT}"/lib/libzmq.a "${QP_ROOT}"/lib/libzmq.so "${QP_ROOT}"/lib/libzmq.so.5
   cp .libs/libzmq.a  "${QP_ROOT}"/lib 
   cp .libs/libzmq.so "${QP_ROOT}"/lib/libzmq.so.5
   cp include/{zmq.h,zmq_utils.h} "${QP_ROOT}"/lib
   cd "${QP_ROOT}"/lib
   ln -s libzmq.so.5 libzmq.so
-  cd -
+  cd ${ORIG}
   return 0
 }
 
diff --git a/scripts/compilation/qp_create_ninja.py b/scripts/compilation/qp_create_ninja.py
index b0fe2f8c..7171c2df 100755
--- a/scripts/compilation/qp_create_ninja.py
+++ b/scripts/compilation/qp_create_ninja.py
@@ -37,6 +37,7 @@ from qp_path import QP_ROOT, QP_SRC, QP_EZFIO
 
 LIB = "" # join(QP_ROOT, "lib", "rdtsc.o") 
 EZFIO_LIB = join(QP_ROOT, "lib", "libezfio.a") 
+ZMQ_LIB   = join(QP_ROOT, "lib", "libzmq.a") + " "  + join(QP_ROOT, "lib", "libf77zmq.a") 
 ROOT_BUILD_NINJA = join(QP_ROOT, "config", "build.ninja")
 
 header = r"""#
@@ -95,7 +96,7 @@ def ninja_create_env_variable(pwd_config_file):
         l_string.append(str_)
 
     lib_lapack = get_compilation_option(pwd_config_file, "LAPACK_LIB")
-    l_string.append("LIB = {0} {1} {2}".format(LIB, lib_lapack, EZFIO_LIB))
+    l_string.append("LIB = {0} {1} {2} {3}".format(LIB, lib_lapack, EZFIO_LIB, ZMQ_LIB))
 
     l_string.append("")