diff --git a/distro/scripts/adl_cots.sh b/distro/scripts/adl_cots.sh index 8cd12eb37868991f437dcff507916f0fdbc39bc0..9fbfb168c8cdd8d00e4e81c2fba1bd13a3657555 100755 --- a/distro/scripts/adl_cots.sh +++ b/distro/scripts/adl_cots.sh @@ -466,35 +466,27 @@ where() mk_hl_region() { echo ${FUNCNAME[0]} - rm -fr ${BUILD}/hdf5_HL* && \ + rm -fr ${BUILD}/hdf5_HL* tar_name=hdf5_HL_REGION-1.1.5.tar.gz && \ install_the_source $tar_name && \ - # export HDF5_INSTALL_DIR=${USER_COTS_PATH} && \ - # export CPPFLAGS="-I${USER_COTS_PATH}/include" && \ - # export LDFLAGS="-static -L${USER_COTS_PATH}/lib64 -L${USER_COTS_PATH}/lib" && \ cd ${BUILD}/hdf5_HL* && \ + export HDF5_INSTALL_DIR=${USER_COTS_PATH} && \ linc=`pwd` && \ make clean && \ - make CC=$CC INCLUDES="$CPPFLAGS -I$linc/src $LDFLAGS -static -lhdf5 -lhdf5_hl -lm" && \ + make CC=$CC INCLUDES="$CPPFLAGS -I$linc/src $LDFLAGS -lhdf5 -lhdf5_hl -lm" && \ make PREFIX=${USER_COTS_PATH} install && \ echo "${FUNCNAME[0]} finished" && \ return 0 } - mk_nagg(){ echo "${FUNCNAME[0]}" - # export CPPFLAGS="-I${USER_COTS_PATH}/include" && \ - # export CFLAGS="-I${USER_COTS_PATH}/include" && \ - # export LDFLAGS=" -static -L${USER_COTS_PATH}/lib64 -L${USER_COTS_PATH}/lib" && \ - # export LIBS="-lhdf5" - cd ${BUILD} tar_name=nagg-1.6.2.tar.gz rm -fr ${BUILD}/nagg* install_the_source ${tar_name} && \ cd nagg-1.6.2 && \ patch -p1 < ${COTS_HOME}/scripts/revised_nagg.patch && \ - ./configure --prefix=${USER_COTS_PATH} --exec-prefix="${USER_COTS_PATH}" --with-hlregion="${USER_COTS_PATH}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" ${LDFLAGS}" && \ + ./configure --prefix=${USER_COTS_PATH} --exec-prefix="${USER_COTS_PATH}" --with-hlregion="${USER_COTS_PATH}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" ${LDFLAGS}" && \ make && \ make install && \ unset LDFLAGS && \