Support compilation w/ clang 23

M2/Macaulay2/e/cytools/computeGV.hpp

@@ -31,6 +31,7 @@ along with CYTools.  If not, see <https://www.gnu.org/licenses/>.
 #include <algorithm>
 #include <unordered_map>
 #include <unordered_set>
+#include <functional> // for std::ref
 
 //// MES: added this to the file /////////////
 using CurveAndGVCollection =

M2/Macaulay2/e/monomials/ExponentList.hpp

@@ -3,6 +3,7 @@
 #define M2_MONOMIALS_EXPONENTLIST_HPP
 
 #include <cstdio>  // for FILE
+#include <iterator> // for std::back_inserter
 #include <vector>  // for vector
 
 #include "engine-includes.hpp"  // for M2_arrayint, M2_ArrayString

M2/cmake/build-libraries.cmake

@@ -598,13 +598,17 @@ _ADD_COMPONENT_DEPENDENCY(libraries givaro gmp GIVARO_FOUND)
 # https://linbox-team.github.io/fflas-ffpack/
 # NOTE: fflas_ffpack is just header files, so we don't build it
 # instead we add an extra autotune target for generating fflas-ffpack-thresholds.h
+# autogen.sh and the patch below write into the source tree, so build from a copy
 string(REGEX REPLACE
-  "./configure$" "${CMAKE_SOURCE_DIR}/submodules/fflas_ffpack/autogen.sh" fflas_ffpack_AUTOGEN "${CONFIGURE}")
+  "./configure$" "<SOURCE_DIR>/autogen.sh" fflas_ffpack_AUTOGEN "${CONFIGURE}")
 set(fflas_ffpack_LICENSEFILES ${CMAKE_SOURCE_DIR}/submodules/fflas_ffpack/COPYING)
 ExternalProject_Add(build-fflas_ffpack
   PREFIX            libraries/fflas_ffpack
-  SOURCE_DIR        ${CMAKE_SOURCE_DIR}/submodules/fflas_ffpack
+  SOURCE_DIR        libraries/fflas_ffpack/source
   BINARY_DIR        libraries/fflas_ffpack/build
+  DOWNLOAD_COMMAND  ${CMAKE_COMMAND} -E copy_directory
+                      ${CMAKE_SOURCE_DIR}/submodules/fflas_ffpack <SOURCE_DIR>
+  PATCH_COMMAND     patch --batch -p1 < ${CMAKE_SOURCE_DIR}/libraries/fflas_ffpack/patch-2.5.0
   CONFIGURE_COMMAND ${fflas_ffpack_AUTOGEN} --prefix=${M2_HOST_PREFIX}
                       #-C --cache-file=${CONFIGURE_CACHE}
                       # --enable-precompilation # build errors

M2/cmake/configure.cmake

@@ -242,8 +242,8 @@ endif()
 # Common flags
 # TODO: reduce these if possible
 add_link_options(-L${M2_HOST_PREFIX}/lib)
+include_directories(BEFORE SYSTEM ${M2_HOST_PREFIX}/include)
 add_compile_options(
-  -I${M2_HOST_PREFIX}/include
   -I${CMAKE_SOURCE_DIR}/include
   -I${CMAKE_BINARY_DIR}/include
   )

M2/libraries/fflas_ffpack/patch-2.5.0

@@ -61,3 +61,30 @@ diff -u b/fflas-ffpack/config-blas.h b/fflas-ffpack/config-blas.h
      }
 
  }
+
+From 50d4dd82c6e16990acfaff97ed219bd47711138e Mon Sep 17 00:00:00 2001
+From: Doug Torrance <dtorrance9@gatech.edu>
+Date: Tue, 15 Sep 2026 14:41:35 -0400
+Subject: [PATCH] Include <exception> for std::terminate; needed w/ clang 23
+Forwarded: https://github.com/linbox-team/fflas-ffpack/pull/422
+
+---
+ fflas-ffpack/field/rns-double-recint.inl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/fflas-ffpack/field/rns-double-recint.inl b/fflas-ffpack/field/rns-double-recint.inl
+index fcaf3a19..bf473221 100644
+--- a/fflas-ffpack/field/rns-double-recint.inl
++++ fflas-ffpack-2.5.0/fflas-ffpack/field/rns-double-recint.inl
+@@ -28,6 +28,8 @@
+ #ifndef __FFLASFFPACK_field_rns_double_recint_INL
+ #define __FFLASFFPACK_field_rns_double_recint_INL
+
++#include <exception>
++
+ #include "fflas-ffpack/fflas/fflas_freduce.h"
+
+ namespace FFPACK {
+-- 
+2.55.0
+