Config for MacOS Sonoma 14.6.1 with Command Line Tools 15.3

.gitmodules

@@ -1,7 +1,9 @@
 [submodule "spack"]
   path = spack
-  url = https://github.com/jcsda/spack
-  branch = release/1.8.0
+  #url = https://github.com/jcsda/spack
+  #branch = release/1.8.0
+  url = https://github.com/srherbener/spack
+  branch = feature/enable-mac-sonoma
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules

configs/sites/tier2/macos.default/packages.yaml

@@ -1,6 +1,9 @@
 packages:
   cairo:
     variants: ~png ~svg
+  # https://github.com/JCSDA/spack-stack/issues/1211
+  fms:
+    variants: +shared
   git:
     buildable: false
   libiconv:

doc/source/NewSiteConfigs.rst

@@ -152,6 +152,9 @@ These instructions are meant to be a reference that users can follow to set up t
    brew install libiconv
    # Note - need to pin to version 5
    brew install qt@5
+   # Note - For Sonoma only, install m4 and pkg-config
+   brew install m4
+   brew install pkg-config
 
    # Note - only needed for running JCSDA's
    # JEDI-Skylab system (using R2D2 localhost)
@@ -248,6 +251,9 @@ Remember to activate the ``lua`` module environment and have MacTeX in your sear
    PATH="$HOMEBREW_ROOT/opt/qt@5/bin:$PATH" \
         spack external find --scope system qt
 
+   PATH="$HOMEBREW_ROOT/opt/m4/bin:$PATH" \
+        spack external find --scope system m4
+
    # Optional, only if planning to build jedi-tools environment with LaTeX support
    # The texlive bin directory must have been added to PATH (see above)
    spack external find --scope system texlive