mirror of
https://github.com/QuantumPackage/qp2.git
synced 2024-12-25 04:53:32 +01:00
Separated opam packages and ocaml in configure
This commit is contained in:
parent
a05ee8f97a
commit
e675192775
20
configure
vendored
20
configure
vendored
@ -207,7 +207,7 @@ if [[ "${PACKAGES}.x" != ".x" ]] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ${PACKAGES} = all ]] ; then
|
if [[ ${PACKAGES} = all ]] ; then
|
||||||
PACKAGES="zlib ninja irpf90 zeromq f77zmq gmp libcap bwrap ocaml ezfio docopt resultsFile bats"
|
PACKAGES="zlib ninja irpf90 zeromq f77zmq gmp libcap bwrap opam opam_packages ezfio docopt resultsFile bats"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -302,7 +302,7 @@ EOF
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
elif [[ ${PACKAGE} = ocaml ]] ; then
|
elif [[ ${PACKAGE} = ocaml || ${PACKAGE} = opam ]] ; then
|
||||||
|
|
||||||
download ${OCAML_URL} "${QP_ROOT}"/external/opam_installer.sh
|
download ${OCAML_URL} "${QP_ROOT}"/external/opam_installer.sh
|
||||||
|
|
||||||
@ -321,14 +321,9 @@ ${QP_ROOT}/bin
|
|||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
rm ${QP_ROOT}/external/opam_installer.sh
|
|
||||||
# source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true
|
|
||||||
#
|
|
||||||
# opam switch create ocaml-base-compiler.4.07.1
|
|
||||||
opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
|
opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
|
||||||
|
|
||||||
eval $(opam env)
|
eval $(opam env)
|
||||||
opam install -y ${OCAML_PACKAGES} || exit 1
|
|
||||||
|
|
||||||
else
|
else
|
||||||
# Conventional commands
|
# Conventional commands
|
||||||
@ -343,17 +338,20 @@ EOF
|
|||||||
| sh ${QP_ROOT}/external/opam_installer.sh
|
| sh ${QP_ROOT}/external/opam_installer.sh
|
||||||
EOF
|
EOF
|
||||||
rm ${QP_ROOT}/external/opam_installer.sh
|
rm ${QP_ROOT}/external/opam_installer.sh
|
||||||
# source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true
|
|
||||||
# opam switch create ocaml-base-compiler.4.07.1 || exit 1
|
|
||||||
|
|
||||||
opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
|
opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
|
||||||
eval $(opam env)
|
eval $(opam env)
|
||||||
execute << EOF
|
|
||||||
opam install -y \${OCAML_PACKAGES} || exit 1
|
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
elif [[ ${PACKAGE} = ocaml || ${PACKAGE} = opam_packages ]] ; then
|
||||||
|
|
||||||
|
|
||||||
|
execute << EOF
|
||||||
|
opam install -y \${OCAML_PACKAGES} || exit 1
|
||||||
|
EOF
|
||||||
|
|
||||||
elif [[ ${PACKAGE} = bse ]] ; then
|
elif [[ ${PACKAGE} = bse ]] ; then
|
||||||
|
|
||||||
download ${BSE_URL} "${QP_ROOT}"/external/bse.tar.gz
|
download ${BSE_URL} "${QP_ROOT}"/external/bse.tar.gz
|
||||||
|
Loading…
Reference in New Issue
Block a user