From d1e89b94a12be890557ca4ad283bbaf1f045b55b Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 2 Dec 2016 11:09:48 +0100 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb63b691..3caef9a0 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Demo * Python >= 2.6 * GNU make * Bash -* Blast/Lapack +* Blas/Lapack * unzip * g++ (For ninja) From 33ee11506211882c095ff8498892e004f023a9d3 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 2 Dec 2016 16:20:02 +0100 Subject: [PATCH 2/2] Removed gmp and zarith dependencies by forcing cryptokit 1.10 --- configure | 9 +-------- install/scripts/install_ocaml.sh | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 5af0769f..128d7126 100755 --- a/configure +++ b/configure @@ -70,7 +70,6 @@ d_dependency = { "resultsFile": ["python"], "emsl": ["python"], "gcc": [], - "gmp": [ "gcc", "make" ], "g++": [], "zeromq" : [ "g++", "make" ], "f77zmq" : [ "zeromq", "python", "make" ], @@ -132,11 +131,6 @@ ninja = Info( description=' ninja', default_path=join(QP_ROOT_BIN, "ninja")) -gmp = Info( - url='https://gmplib.org/download/gmp/gmp-6.1.1.tar.bz2', - description=' GMP library', - default_path=join(QP_ROOT_LIB, "libgmp.so")) - emsl = Info( url='{head}/LCPQ/EMSL_Basis_Set_Exchange_Local/{tail}'.format(**path_github), description=' EMSL basis set library', @@ -156,7 +150,6 @@ f77zmq = Info( url='{head}/zeromq/f77_zmq/{tail}'.format(**path_github), description=' F77-ZeroMQ', default_path=join(QP_ROOT_LIB, "libf77zmq.a") ) -# join(QP_ROOT, "src", "ZMQ", "f77zmq.h") ) p_graphviz = Info( url='https://github.com/xflr6/graphviz/archive/master.tar.gz', @@ -172,7 +165,7 @@ d_info = dict() for m in ["ocaml", "m4", "curl", "zlib", "patch", "irpf90", "docopt", "resultsFile", "ninja", "emsl", "ezfio", "p_graphviz", - "zeromq", "f77zmq","bats", "gmp" ]: + "zeromq", "f77zmq","bats"]: exec ("d_info['{0}']={0}".format(m)) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index ea5bb5e4..b82216d3 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -5,7 +5,7 @@ QP_ROOT=$PWD cd - # Normal installation -PACKAGES="core cryptokit zarith ocamlfind sexplib ZMQ" +PACKAGES="core cryptokit.1.10 ocamlfind sexplib ZMQ" #ppx_sexp_conv # Needed for ZeroMQ