From 2be56e5e7af6aa7502f089b216c422e744db5eb8 Mon Sep 17 00:00:00 2001
From: biagas <biagas2@llnl.gov>
Date: Mon, 3 Aug 2026 12:39:19 -0700
Subject: [PATCH] Update MOAB to version 5.6.0 in bv_moab.

Turn off LABACK and eigen in the MOAB build.
Update VisIt version to 3.6.0 in build_visit.
Add MOAB note to release notes.
Move release note about build_visit --cleanup to the build_visit section.
---
 src/resources/help/en_US/relnotes3.6.0.html |  5 ++---
 src/tools/dev/scripts/build_visit           |  2 +-
 src/tools/dev/scripts/bv_support/bv_moab.sh | 18 ++++++++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/resources/help/en_US/relnotes3.6.0.html b/src/resources/help/en_US/relnotes3.6.0.html
index d94dec04956..a81dd217675 100644
--- a/src/resources/help/en_US/relnotes3.6.0.html
+++ b/src/resources/help/en_US/relnotes3.6.0.html
@@ -95,15 +95,14 @@
 <a name="Build_features"></a>
 <p><b><font size="4">Changes to build_visit in version 3.6</font></b></p>
 <ul>
-  <li>Build Feature 1</li>
-  <li>Build Feature 2</li>
+  <li>build_visit now has a `--cleanup` option. When turned on it triggers deletion of src and build dirs for each library if build and install are successful.</li>
+  <li>MOAB was updated to version 5.6.0.</li>
 </ul>
 
 <a name="Dev_changes"></a>
 <p><b><font size="4">Changes for VisIt developers in version 3.6</font></b></p>
 <ul>
   <li>Enhanced <code>multi_test.C</code> data generator to handle both single and double precision.</li>
-  <li>build_visit now has a `--cleanup` option. When turned on it triggers deletion of src and build dirs for each library if build and install are successful.</li>
 </ul>
 
 <p>Click the following link to view the release notes for the previous version
diff --git a/src/tools/dev/scripts/build_visit b/src/tools/dev/scripts/build_visit
index ed5f9d894c8..7cb702127c6 100755
--- a/src/tools/dev/scripts/build_visit
+++ b/src/tools/dev/scripts/build_visit
@@ -30,7 +30,7 @@
 # To create your own modular file, see the docs at
 # //https://visit-sphinx-github-user-manual.readthedocs.io/en/develop/dev_manual/CreatingABuildVisItModule.html
 
-export VISIT_VERSION=${VISIT_VERSION:-"3.5.0"}
+export VISIT_VERSION=${VISIT_VERSION:-"3.6.0"}
 
 ####
 # Trunk:
diff --git a/src/tools/dev/scripts/bv_support/bv_moab.sh b/src/tools/dev/scripts/bv_support/bv_moab.sh
index 392392d252b..33008b41e79 100644
--- a/src/tools/dev/scripts/bv_support/bv_moab.sh
+++ b/src/tools/dev/scripts/bv_support/bv_moab.sh
@@ -22,10 +22,10 @@ function bv_moab_depends_on
 
 function bv_moab_info
 {
-    export MOAB_VERSION=${MOAB_VERSION:-"5.5.0"}
+    export MOAB_VERSION=${MOAB_VERSION:-"5.6.0"}
     export MOAB_FILE=${MOAB_FILE:-"moab-${MOAB_VERSION}.tar.gz"}
-    export MOAB_BUILD_DIR=${MOAB_BUILD_DIR:-"moab-5.5.0"}
-    export MOAB_SHA256_CHECKSUM="58969f8a1b209ec9036c08c53a6b7078b368eb3bf99d0368a4de5a2f2a8db678"
+    export MOAB_BUILD_DIR=${MOAB_BUILD_DIR:-"moab-${MOAB_VERSION}"}
+    export MOAB_SHA256_CHECKSUM="8d24a38619eb9fd326c7bdf9fdb01466149a0ab7dc3ef1caffda728858bf5a85"
 }
 
 function bv_moab_print
@@ -99,7 +99,9 @@ function build_moab
     fi
 
     cf_prefix_arg="--prefix=$VISITDIR/moab/$MOAB_VERSION/$VISITARCH"
-    cf_common_args="--with-pic --disable-fortran --disable-imesh --disable-cgns"
+    cf_common_args="--with-pic --disable-fortran --without-cgns"
+    # MOAB's configure falls back to system Eigen3 paths unless forced to a bad path.
+    cf_common_args="${cf_common_args} --disable-blaslapack --with-eigen3=/no/such/eigen3"
 
     if [[ "DO_STATIC_BUILD" == "yes" ]]; then
         cf_static_args="--enable-static --disable-shared"
@@ -108,9 +110,16 @@ function build_moab
     fi
 
     cf_hdf5_ldflags_arg=""
+    cf_ldflags_arg=""
     cf_zlib_arg=""
     cf_hdf5_arg="--with-hdf5=$VISITDIR/hdf5/$HDF5_VERSION/$VISITARCH"
     cf_zlib_arg="--with-zlib=$VISITDIR/zlib/$ZLIB_VERSION/$VISITARCH"
+    cf_hdf5_libdir="$VISITDIR/hdf5/$HDF5_VERSION/$VISITARCH/lib"
+    cf_zlib_libdir="$VISITDIR/zlib/$ZLIB_VERSION/$VISITARCH/lib"
+    cf_ldflags_arg="-L$cf_hdf5_libdir -L$cf_zlib_libdir"
+    if [[ "$OPSYS" != "Darwin" ]]; then
+        cf_ldflags_arg="$cf_ldflags_arg -Wl,-rpath-link,$cf_hdf5_libdir -Wl,-rpath-link,$cf_zlib_libdir"
+    fi
     cf_hdf5_ldflags_arg="$cf_hdf5_ldflags_arg -lz"
     if [[ -n "$cf_hdf5_ldflags_arg" ]]; then
         cf_hdf5_ldflags_arg="--with-hdf5-ldflags=\"$cf_hdf5_ldflags_arg\""
@@ -121,6 +130,7 @@ function build_moab
     sh -c "./configure \
         CXX=\"$cf_cxx_compiler\" CXXFLAGS=\"$CXXFLAGS $CXX_OPT_FLAGS $hdf5_consumer_uses_mpi_flag\" \
         CC=\"$cf_c_compiler\" CFLAGS=\"$CFLAGS $C_OPT_FLAGS $hdf5_consumer_uses_mpi_flag\" \
+        LDFLAGS=\"$LDFLAGS $cf_ldflags_arg\" \
         ${cf_prefix_arg} ${cf_mpi_arg} ${cf_common_args} ${cf_static_args} \
         ${cf_hdf5_arg} ${cf_hdf5_ldflags_arg} \
         ${cf_zlib_arg}"