From 9c19b63f6a0926b243de1cc5c5b08863627e93b5 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 18 Aug 2017 12:45:43 +0200 Subject: [PATCH 1/7] Try to pin to ocaml 4.02.1 --- install/scripts/install_ocaml.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index b82216d3..d1c28d67 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -66,6 +66,7 @@ chmod +x ocaml.sh || exit 1 echo N | ./ocaml.sh ${QP_ROOT}/bin/ || exit 1 +${QP_ROOT}/bin/opam switch 4.02.1 || exit 1 ${QP_ROOT}/bin/opam config setup -a -q || exit 1 export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH} From 3f08cc93a2edfa2080dea68fad7179108a554f8c Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 18 Aug 2017 13:46:40 +0200 Subject: [PATCH 2/7] Using OCaml 4.02.3 --- install/scripts/install_ocaml.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index d1c28d67..bfdc7526 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -64,9 +64,8 @@ fi cd Downloads || exit 1 chmod +x ocaml.sh || exit 1 -echo N | ./ocaml.sh ${QP_ROOT}/bin/ || exit 1 +echo N | ./ocaml.sh ${QP_ROOT}/bin/ 4.02.3 || exit 1 -${QP_ROOT}/bin/opam switch 4.02.1 || exit 1 ${QP_ROOT}/bin/opam config setup -a -q || exit 1 export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH} From 876411cb61f6c981bc7c7c1cc13df9ffc7f515f3 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 18 Aug 2017 14:09:48 +0200 Subject: [PATCH 3/7] Using OCaml 4.02.3 --- install/scripts/install_ocaml.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index bfdc7526..203dbb78 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -75,6 +75,7 @@ source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true NCPUs=$(cat /proc/cpuinfo | grep -i MHz | wc -l) +${QP_ROOT}/bin/opam install -j ${NCPUs} ZMQ -y -q || exit 1 ${QP_ROOT}/bin/opam install -j ${NCPUs} ${PACKAGES} -y -q || exit 1 rm -f ../_build/ocaml.log From fc479f59a6592aab5f1cc7d668aa7281df42526e Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 18 Aug 2017 14:47:11 +0200 Subject: [PATCH 4/7] Fix ZMQ installation problem --- install/scripts/install_ocaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index 203dbb78..e2d28926 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -70,7 +70,7 @@ ${QP_ROOT}/bin/opam config setup -a -q || exit 1 export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH} export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH} -export C_INCLUDE_PATH=${QP_ROOT}/lib:${C_INCLUDE_PATH} +export C_INCLUDE_PATH=${QP_ROOT}/lib:${QP_ROOT}/include:$(ocamlopt -where)/../../include/ocaml_stdint:${C_INCLUDE_PATH} source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true From 16d981e9eeb2dab7b59c08b0f9a7f63826499fa5 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 18 Aug 2017 15:07:54 +0200 Subject: [PATCH 5/7] Fix ZMQ installation problem --- install/scripts/install_ocaml.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index e2d28926..486ead4a 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -70,12 +70,12 @@ ${QP_ROOT}/bin/opam config setup -a -q || exit 1 export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH} export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH} -export C_INCLUDE_PATH=${QP_ROOT}/lib:${QP_ROOT}/include:$(ocamlopt -where)/../../include/ocaml_stdint:${C_INCLUDE_PATH} +export C_INCLUDE_PATH=${QP_ROOT}/lib:${QP_ROOT}/include:${C_INCLUDE_PATH} source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true NCPUs=$(cat /proc/cpuinfo | grep -i MHz | wc -l) -${QP_ROOT}/bin/opam install -j ${NCPUs} ZMQ -y -q || exit 1 +${QP_ROOT}/bin/opam install -j ${NCPUs} stdint.0.4.2 ZMQ -y -q || exit 1 ${QP_ROOT}/bin/opam install -j ${NCPUs} ${PACKAGES} -y -q || exit 1 rm -f ../_build/ocaml.log From f754d5917b58d7a425d4be69494750a36a7fe3dc Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 18 Aug 2017 15:20:24 +0200 Subject: [PATCH 6/7] Update install_ocaml.sh --- install/scripts/install_ocaml.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index 486ead4a..f6978df2 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -75,7 +75,8 @@ source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true NCPUs=$(cat /proc/cpuinfo | grep -i MHz | wc -l) -${QP_ROOT}/bin/opam install -j ${NCPUs} stdint.0.4.2 ZMQ -y -q || exit 1 +${QP_ROOT}/bin/opam install -j ${NCPUs} stdint.0.4.2 -y -q || exit 1 +${QP_ROOT}/bin/opam install -j ${NCPUs} ZMQ -y -q || exit 1 ${QP_ROOT}/bin/opam install -j ${NCPUs} ${PACKAGES} -y -q || exit 1 rm -f ../_build/ocaml.log From b0ff7d934da5732cdca330361e07f01a6d507af3 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 18 Aug 2017 15:52:54 +0200 Subject: [PATCH 7/7] Update install_ocaml.sh --- install/scripts/install_ocaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index f6978df2..80632dd2 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -64,7 +64,7 @@ fi cd Downloads || exit 1 chmod +x ocaml.sh || exit 1 -echo N | ./ocaml.sh ${QP_ROOT}/bin/ 4.02.3 || exit 1 +echo N | ./ocaml.sh ${QP_ROOT}/bin/ 4.02.1 || exit 1 ${QP_ROOT}/bin/opam config setup -a -q || exit 1