From 0fca3ca66dfab1a481ec078c4a0f6d89921a697e Mon Sep 17 00:00:00 2001
From: David Minton <daminton@purdue.edu>
Date: Mon, 29 Jan 2024 12:18:06 -0500
Subject: [PATCH] more updates attempting to get SHTOOLS built properly

---
 buildscripts/set_environment_macos.sh | 3 ++-
 pyproject.toml                        | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/buildscripts/set_environment_macos.sh b/buildscripts/set_environment_macos.sh
index cd51f1865..03a333c8e 100755
--- a/buildscripts/set_environment_macos.sh
+++ b/buildscripts/set_environment_macos.sh
@@ -12,7 +12,7 @@ CPATH="/usr/local/include:${PREFIX}/include:${HOMEBREW_PREFIX}/include:${ROOT_DI
 CPPFLAGS="-isystem ${PREFIX}/include -isystem /usr/local/include -Xclang -fopenmp"
 LIBS="-lomp"
 CFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -Wno-deprecated-non-prototype -arch ${ARCH}"
-FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
+FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -fno-underscoring"
 FFFLAGS="${FCFLAGS}"
 CFLAGS="${FCFLAGS} -Wno-deprecated-non-prototype"
 CXXFLAGS="${CFLAGS}"
@@ -26,6 +26,7 @@ NETCDF_FORTRAN_HOME="${NFDIR}"
 NETCDF_FORTRAN_INCLUDE="${NFDIR}/include"
 FC="$(command -v gfortran-12)"
 F77="${FC}"
+F95="${FC}"
 CC="/usr/bin/clang"
 CXX="/usr/bin/clang++"
 CPP="/usr/bin/cpp"
diff --git a/pyproject.toml b/pyproject.toml
index c7b1f6201..dc34c49c5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,7 +40,8 @@ dependencies = [
     'cython>=3.0',
     'meson>=1.3',
     'meson-python>=0.15',
-    'pyshtools==4.11.10'
+    'setuptools_scm',
+    'pyshtools>=4.11.10'
 ]
 
 [project.urls]
@@ -63,7 +64,6 @@ requires = [
     "sphinxext-rediraffe",
     "sphinxext-opengraph",
     "nbsphinx",
-    'meson-python>=0.15',
     "ford"
 ]
 build-backend = "scikit_build_core.build"
@@ -103,8 +103,10 @@ NCDIR="${PREFIX}"
 NFDIR="${PREFIX}"
 NETCDF_FORTRAN_HOME="${NFDIR}"
 NETCDF_FORTRAN_INCLUDE="${NFDIR}/include"
+SHTOOLS_HOME="${PREFIX}"
 FC="$(command -v gfortran-12)"
 F77="${FC}"
+F95="${FC}"
 CC="/usr/bin/clang"
 CXX="/usr/bin/clang++"
 CPP="/usr/bin/cpp"
@@ -134,6 +136,7 @@ LD_LIBRARY_PATH="${PREFIX}/lib:/project/lib:${HDF5_LIBDIR}"
 CPATH="${PREFIX}/include:/project/include:${HDF5_INCLUDE_DIR}"
 netCDF-Fortran_DIR="${PREFIX}/lib/cmake/netCDF"
 HDF5_DIR="${HDF5_ROOT}/cmake"
+SHTOOLS_HOME="${PREFIX}"
 PATH="${HDF5_ROOT}/bin:${PATH}"
 CMAKE_INSTALL_LIBDIR="lib"