where

distro/scripts/adl_cots.sh

@@ -473,7 +473,8 @@ nagg(){
     install_the_source ${tar_name}  && \
     cd hdf5_HL_REGION*  && \
     export HDF5_INSTALL_DIR=${USER_COTS_PATH}  && \
-    export LDFLAGS="-static"  && \
+    export LDFLAGS="-static -L${USER_COTS_PATH}/lib"  && \
+    ls ${USER_COTS_PATH}/lib
     make
     make install
     cd  ${BUILD}  && \
@@ -481,7 +482,7 @@ nagg(){
     rm -fr ${BUILD}/nagg*  && \
     install_the_source ${tar_name}  && \
     ls && \
-    which patch && \
+    ls ${USER_COTS_PATH}/lib
     cd nagg-1.6.2  && \
     patch -p1 <  ${COTS_HOME}/scripts/revised_nagg.patch   && \
     export CFLAGS=" -I${USER_COTS_PATH}/include "${CFLAGS}
@@ -552,19 +553,19 @@ _rpath_setter() {
 
     DESIRED_RPATH=$1
     ORIGIN_DIRECTORY=$2
-    cd $ORIGIN_DIRECTORY
+    cd "${ORIGIN_DIRECTORY}"
     #EXES=$(ls *)
-    EXES=$(find ${ORIGIN_DIRECTORY} -type f -perm -700 | wc -l)
+    EXES=$(find "${ORIGIN_DIRECTORY}" -type f -perm -700)
 
-    printf "Desired %s\n" '$DESIRED_RPATH'
+    printf "Desired %s\n" $DESIRED_RPATH
     for exe in ${EXES}; do
         printf "Start for %s\n" $exe
         #patchelf --remove-rpath $exe
-        patchelf --set-rpath $DESIRED_RPATH $exe
-        patchelf --shrink-rpath $exe
-        printf "Final for %s\n" $exe
-        patchelf --print-rpath $exe
-        ldd $exe
+        patchelf --set-rpath ${DESIRED_RPATH} ${exe}
+        patchelf --shrink-rpath ${exe}
+        printf "Final for %s\n" ${exe}
+        patchelf --print-rpath ${exe}
+        ldd ${exe}
     done
 }
 export ADL_HOME=${COTSBASE}/libexec/ADL
@@ -594,8 +595,8 @@ patch_adl_rpaths() {
 all()
 {
     
-        DESIRED_RPATH='$ORIGIN:$ORIGIN/../bin:$ORIGIN/../lib:$ORIGIN/../lib64:'
-        wipe
+    DESIRED_RPATH='$ORIGIN:$ORIGIN/../bin:$ORIGIN/../lib:$ORIGIN/../lib64:'
+    wipe
     for_container && \
     mk_xerces && \
     mk_png  && \
@@ -605,6 +606,7 @@ all()
     mk_wgrib2 && \
     mk_szip && \
     mk_hdf5 && \
+    nagg && \
     mk_log4cplus && \
     mk_slibc && \
     mk_sqlite && \
@@ -616,12 +618,12 @@ all()
     mk_cminpak && \
     mk_proto && \
     where  && \
-    nagg && \
+
     fix_links && \
     echo "COTS Built" && \
-    _rpath_setter $DESIRED_RPATH $USER_COTS_PATH/lib && \
-    _rpath_setter $DESIRED_RPATH $USER_COTS_PATH/lib64 && \
-    _rpath_setter $DESIRED_RPATH $USER_COTS_PATH/bin && \
+    _rpath_setter ${DESIRED_RPATH} ${USER_COTS_PATH}/lib && \
+    _rpath_setter ${DESIRED_RPATH} ${USER_COTS_PATH}/lib64 && \
+    _rpath_setter ${DESIRED_RPATH} ${USER_COTS_PATH}/bin && \
     echo "Rpaths patched"
 }