Merge pull request #503 from NOAA-EPIC/bugfix/build_libs

Bugfix/build libs
NOAA-EMC · Nov 15, 2022 · fb310cb · fb310cb
2 parents 42db447 + 270e924
commit fb310cb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/libs/build_gftl_shared.sh b/libs/build_gftl_shared.sh
@@ -49,4 +49,4 @@ VERBOSE=$MAKE_VERBOSE make -j${NTHREADS:-4} install
 
 # generate modulefile from template
 $MODULES && update_modules compiler $name $id
-echo $name $URL >> ${HPC_STACK_ROOT}/hpc-stack-contents.log
+echo $name $version $URL >> ${HPC_STACK_ROOT}/hpc-stack-contents.log
diff --git a/libs/build_gsl.sh b/libs/build_gsl.sh
@@ -46,5 +46,5 @@ make -j${NTHREADS:-4}
 $SUDO make install
 
 modpath=compiler
-$MODULES && update_modules $modpath $name $version \
-         || echo $name $version $url >> ${HPC_STACK_ROOT}/hpc-stack-contents.log
+$MODULES && update_modules $modpath $name $version
+echo $name $version $url >> ${HPC_STACK_ROOT}/hpc-stack-contents.log
diff --git a/libs/build_met.sh b/libs/build_met.sh
@@ -21,7 +21,7 @@ if $MODULES; then
     module load bufr
     module load zlib
     module load jasper
-    module try-load png
+    module try-load libpng
     module load g2c
     module load hdf5
     module load netcdf
@@ -79,7 +79,7 @@ export GRIB2CLIB_NAME=-lg2c
 jasper_libdir=`find ${JASPER_ROOT} -name libjasper.a -exec dirname {} \;`
 export LIB_JASPER=$jasper_libdir
 
-export LIB_LIBPNG=${PNG_LIBDIR}
+export LIB_LIBPNG=${PNG_LIBRARIES}
 export LIB_Z=${ZLIB_ROOT}/lib
 
 if [[ $enable_python =~ [yYtT] ]]; then
@@ -103,7 +103,7 @@ LDFLAGS3="-L${MET_GRIB2CLIB} -L${MET_GSL}/lib"
 LDFLAGS4="-L${LIB_JASPER} -L${MET_HDF5}/lib -L${LIB_LIBPNG} -L${LIB_Z}"
 
 export LDFLAGS="-fPIE ${LDFLAGS2:-} ${LDFLAGS3:-} ${LDFLAGS4:-}"
-export LIBS="-lhdf5_hl -lhdf5 -lz"
+export LIBS="-lhdf5_hl -lhdf5 -lz -ldl"
 
 [[ -d $pkg_name ]] && cd $pkg_name || ( echo "$pkg_name does not exist, ABORT!"; exit 1 )
 

diff --git a/libs/build_nceplibs.sh b/libs/build_nceplibs.sh
@@ -247,8 +247,12 @@ fi
 
 cd ${HPC_STACK_ROOT}/${PKGDIR:-"pkg"}
 
-# Download CRTM fix files
 if [[ "$name" == "crtm" ]]; then
+# Correction to allow for the crtm-2.4.0 serial build:
+  if [[ "${version}" == "v2.4.0" ]]; then
+sed -i'.orig' -e 's/  find_package(MPI REQUIRED)/\#  find_package(MPI REQUIRED)/g' ./cmake/FindNetCDF.cmake
+  fi
+# Download CRTM fix files
   if [[ ${STACK_crtm_install_fix:-} =~ [yYtT] ]]; then
     if [[ ! -d crtm_fix-${install_as} ]]; then
       crtm_tarball=fix_REL-${install_as}_emc.tgz