From 9119935fb9da2ff7887d30a7d5ae74be0177b0ab Mon Sep 17 00:00:00 2001
From: Scott Mindock <srmindock@wisc.edu>
Date: Tue, 16 Apr 2024 14:23:30 +0000
Subject: [PATCH] where

---
 distro/scripts/adl_cots.sh | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/distro/scripts/adl_cots.sh b/distro/scripts/adl_cots.sh
index dae8ff4..f6d4135 100755
--- a/distro/scripts/adl_cots.sh
+++ b/distro/scripts/adl_cots.sh
@@ -463,22 +463,29 @@ where()
     return 0
 }
 
-
+mk_hl_region()
+{
+    echo ${FUNCNAME[0]}
+    rm -fr ${BUILD}/hdf5_HL* && \
+    tar_name=hdf5_HL_REGION-1.1.5.tar  && \
+    install_the_source $tar_name   && \
+    export HDF5_INSTALL_DIR=${USER_COTS_PATH} && \
+    export CPPFLAGS="-I${USER_COTS_PATH}/include"  && \
+    export LDFLAGS="-L${USER_COTS_PATH}/lib64 -L${USER_COTS_PATH}/lib"  && \
+    cd ${BUILD}/hdf5_HL*  && \
+    linc=`pwd`  && \
+    make clean  && \
+    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
+}
 nagg(){
     echo "${FUNCNAME[0]}"
+    export CPPFLAGS="-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=hdf5_HL_REGION-1.1.5.tar.gz  
-    rm -fr ${BUILD}/hdf5_HL_REGION*  
-    install_the_source ${tar_name}  && \
-    cd hdf5_HL_REGION*  && \
-    export HDF5_INSTALL_DIR=${USER_COTS_PATH}/lib  && \
-    export LDFLAGS=" -static -L${USER_COTS_PATH}/lib "  && \
-    export CPPFLAGS=" -I${USER_COTS_PATH}/include "${CPPFLAGS}
-    export LIBS="-L${USER_COTS_PATH}/lib -lhdf5"
-    ls ${USER_COTS_PATH}/lib
-    make
-    make install
     cd  ${BUILD}  && \
     tar_name=nagg-1.6.2.tar.gz  && \
     rm -fr ${BUILD}/nagg*  && \
@@ -491,7 +498,7 @@ nagg(){
     patch -p1 <  ${COTS_HOME}/scripts/revised_nagg.patch   && \
 
     ./configure --help
-    ./configure  --prefix=${USER_COTS_PATH}   --exec-prefix=${USER_COTS_PATH} --with-hlregion=${USER_COTS_PATH}/lib   && \
+    ./configure  --prefix=${USER_COTS_PATH} --exec-prefix="${USER_COTS_PATH}" --with-hlregion="${USER_COTS_PATH}/lib" CPPFLAGS="-I${USER_COTS_PATH}/include" LDFLAGS=" -static -L${USER_COTS_PATH}/lib64 -L${USER_COTS_PATH}/lib" LIBS="-lhdf5"  && \
     make   && \
     make install   && \
     ls ${USER_COTS_PATH}/bin
@@ -623,6 +630,7 @@ all()
     mk_cminpak && \
     mk_proto && \
     where  && \
+    mk_hl_region && \
     nagg && \
     fix_links && \
     echo "COTS Built" && \
-- 
GitLab