support trilinos and netcdf on M1

diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
index aa9a4cbc745fd2fd53f00855fd231e382062a8b1..81df78c4fac98e6ee071c8bfef239f6e820c95be 100644 (file)
--- a/deal.II-toolchain/packages/trilinos.package
+++ b/deal.II-toolchain/packages/trilinos.package
@@ -201,7 +201,10 @@ if [ ! -z "${SUPERLU_DIR}" ]; then
 fi
 
 # support netCDF and SEACAS (if netCDF is available)
-if [ ! -z "${NETCDF_DIR}" ]; then
+if [ -z "${TRILINOS_WITH_SEACAS}" ]; then
+    TRILINOS_WITH_SEACAS=ON
+fi
+if [ ${TRILINOS_WITH_SEACAS} = ON ] && [ ! -z "${NETCDF_DIR}" ]; then
     cecho ${INFO} "trilinos: configuration with netCDF and SEACAS"
 
     CONFOPTS="${CONFOPTS} \
@@ -227,7 +230,6 @@ CONFOPTS="\
   -D Trilinos_ENABLE_Ifpack:BOOL=ON \
   -D Trilinos_ENABLE_Ifpack2:BOOL=OFF \
   -D Trilinos_ENABLE_Tpetra:BOOL=ON \
-  -D   Tpetra_INST_INT_LONG_LONG:BOOL=ON \
   -D Trilinos_ENABLE_AztecOO:BOOL=ON \
   -D Trilinos_ENABLE_Sacado:BOOL=ON \
   -D Trilinos_ENABLE_Teuchos:BOOL=ON \

diff --git a/deal.II-toolchain/platforms/supported/macos.platform b/deal.II-toolchain/platforms/supported/macos.platform
index ac25c41d1e2b0c8a7ff2afcf683b0b2de52ec2bf..bbf12c573a6c74af22366041a6779ef3a66ffc4a 100644 (file)
--- a/deal.II-toolchain/platforms/supported/macos.platform
+++ b/deal.II-toolchain/platforms/supported/macos.platform
@@ -46,3 +46,12 @@
 # you may change the security policy for developments. To do so,
 # enable Terminal in System Preferences / Security & Privacy / Developer Tools .
 ##
+
+if [ "$(machine)" = "arm64e" ]; then
+  cecho ${INFO} "MacOS on arm64 detected!"
+
+  # Trilinos will link with netcdf and indirectly hdf5, but linking fails. Just
+  # disable this for now.
+  TRILINOS_WITH_SEACAS=OFF
+
+fi