diff --git a/config/gfortran.cfg b/config/gfortran.cfg index 50dd00d1..d84d8486 100644 --- a/config/gfortran.cfg +++ b/config/gfortran.cfg @@ -10,7 +10,7 @@ # # [COMMON] -FC : gfortran -ffree-line-length-none +FC : gfortran -ffree-line-length-none -I . LAPACK_LIB : -lblas -llapack IRPF90 : irpf90 IRPF90_FLAGS : --ninja --align=32 diff --git a/configure b/configure index 05128976..b810f600 100755 --- a/configure +++ b/configure @@ -128,7 +128,7 @@ ezfio = Info( d_info = dict() -for m in ["ocaml", "m4", "curl", "zlib", "path", "irpf90", "docopt", "gcc", +for m in ["ocaml", "m4", "curl", "zlib", "path", "irpf90", "docopt", "resultsFile", "ninja", "emsl", "ezfio"]: exec ("d_info['{0}']={0}".format(m)) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index 34410c62..5c9bb89e 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -32,7 +32,10 @@ export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH} export C_INCLUDE_PATH=${QP_ROOT}/lib:${C_INCLUDE_PATH} source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true -${QP_ROOT}/bin/opam install ${PACKAGES} -y -q || exit 1 + +NCPUs=$(cat /proc/cpuinfo | grep -i MHz | wc -l) +${QP_ROOT}/bin/opam install -j ${NCPUs} ${PACKAGES} -y -q || exit 1 + rm -f ../_build/ocaml.log exit 0 diff --git a/install/scripts/install_zlib.sh b/install/scripts/install_zlib.sh index 26139f5c..06ce67f3 100755 --- a/install/scripts/install_zlib.sh +++ b/install/scripts/install_zlib.sh @@ -14,6 +14,8 @@ function _install() make install prefix=$QP_ROOT/install/${TARGET} || exit 1 ln -s -f $QP_ROOT/install/${TARGET}/lib/libz.so $QP_ROOT/lib || exit 1 ln -s -f $QP_ROOT/install/${TARGET}/lib/libz.a $QP_ROOT/lib || exit 1 + ln -s -f $QP_ROOT/install/${TARGET}/include/zlib.h $QP_ROOT/lib || exit 1 + ln -s -f $QP_ROOT/install/${TARGET}/include/zconf.h $QP_ROOT/lib || exit 1 } source scripts/build.sh