mirror of
https://github.com/LCPQ/quantum_package
synced 2024-12-23 04:43:50 +01:00
Merge branch 'LCPQ-master'
Conflicts: install/scripts/install_ocaml.sh
This commit is contained in:
commit
2244411e0c
@ -5,8 +5,7 @@ QP_ROOT=$PWD
|
|||||||
cd -
|
cd -
|
||||||
|
|
||||||
# Normal installation
|
# Normal installation
|
||||||
PACKAGES="core cryptokit.1.10 ocamlfind sexplib ZMQ"
|
PACKAGES="core cryptokit.1.10 ocamlfind sexplib ZMQ ppx_sexp_conv ppx_derived"
|
||||||
#ppx_sexp_conv
|
|
||||||
|
|
||||||
# Needed for ZeroMQ
|
# Needed for ZeroMQ
|
||||||
export C_INCLUDE_PATH="${QP_ROOT}"/include:"${C_INCLUDE_PATH}"
|
export C_INCLUDE_PATH="${QP_ROOT}"/include:"${C_INCLUDE_PATH}"
|
||||||
@ -64,17 +63,19 @@ fi
|
|||||||
cd Downloads || exit 1
|
cd Downloads || exit 1
|
||||||
chmod +x ocaml.sh || 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.04.2 || exit 1
|
||||||
|
|
||||||
${QP_ROOT}/bin/opam config setup -a -q || exit 1
|
${QP_ROOT}/bin/opam config setup -a -q || exit 1
|
||||||
|
|
||||||
export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH}
|
export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH}
|
||||||
export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH}
|
export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH}
|
||||||
export C_INCLUDE_PATH=${QP_ROOT}/lib:$(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
|
source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
|
||||||
|
|
||||||
|
|
||||||
NCPUs=$(cat /proc/cpuinfo | grep -i MHz | wc -l)
|
NCPUs=$(cat /proc/cpuinfo | grep -i MHz | wc -l)
|
||||||
|
${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
|
${QP_ROOT}/bin/opam install -j ${NCPUs} ${PACKAGES} -y -q || exit 1
|
||||||
|
|
||||||
rm -f ../_build/ocaml.log
|
rm -f ../_build/ocaml.log
|
||||||
|
Loading…
Reference in New Issue
Block a user