diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index d094dd6..fef2fae 100755
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -57,6 +57,7 @@ jobs:
         UPLOAD_PACKAGES: 'True'
         DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le
   timeoutInMinutes: 360
+  variables: {}
 
   steps:
   # configure qemu binfmt-misc running.  This allows us to run docker containers
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
index 696aa9c..f1de6cc 100755
--- a/.azure-pipelines/azure-pipelines-osx.yml
+++ b/.azure-pipelines/azure-pipelines-osx.yml
@@ -5,7 +5,7 @@
 jobs:
 - job: osx
   pool:
-    vmImage: macOS-11
+    vmImage: macOS-12
   strategy:
     matrix:
       osx_64_python3.10.____cpythonpython_implcpython:
@@ -42,6 +42,7 @@ jobs:
         CONFIG: osx_arm64_python3.9.____cpython
         UPLOAD_PACKAGES: 'True'
   timeoutInMinutes: 360
+  variables: {}
 
   steps:
   # TODO: Fast finish on azure pipelines?
diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml
index edf405d..8e0d5b6 100644
--- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml
index dd47cad..0bc3310 100644
--- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml
index 092bc66..285301a 100644
--- a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml
index 7bbf6e9..6ceca5f 100644
--- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml
index 69cc3b6..5d93f62 100644
--- a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml
+++ b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml
@@ -1,5 +1,9 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml
index 316a095..681c74a 100644
--- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml
index 7b975bc..65bf835 100644
--- a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -11,9 +15,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -25,7 +31,9 @@ python_impl:
 target_platform:
 - linux-aarch64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml
index 9888686..1200607 100644
--- a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -11,9 +15,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -25,7 +31,9 @@ python_impl:
 target_platform:
 - linux-aarch64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml
index a5720a4..8ad0686 100644
--- a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -11,9 +15,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -25,7 +31,9 @@ python_impl:
 target_platform:
 - linux-aarch64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml
index 05f40ef..b10ffc4 100644
--- a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -11,9 +15,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -25,7 +31,9 @@ python_impl:
 target_platform:
 - linux-aarch64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml
index 045f810..cc6cad5 100644
--- a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml
+++ b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml
@@ -1,5 +1,9 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -11,9 +15,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -25,7 +31,9 @@ python_impl:
 target_platform:
 - linux-aarch64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml
index b8d1434..1c50d57 100644
--- a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml
@@ -1,5 +1,9 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -11,9 +15,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -25,7 +31,9 @@ python_impl:
 target_platform:
 - linux-aarch64
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml
index 73b6b70..16b92a9 100644
--- a/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml
@@ -1,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-ppc64le
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-ppc64le
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml
index 1c4be06..81126d3 100644
--- a/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml
@@ -1,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-ppc64le
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-ppc64le
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml
index 6a1f99a..52dfcd3 100644
--- a/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml
@@ -1,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-ppc64le
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-ppc64le
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml
index d9e76e7..62da414 100644
--- a/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml
@@ -1,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-ppc64le
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-ppc64le
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml
index e3a0d3d..b018d43 100644
--- a/.ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml
+++ b/.ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml
@@ -1,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-ppc64le
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-ppc64le
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml
index 152a509..c902e60 100644
--- a/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml
+++ b/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml
@@ -1,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -7,9 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-ppc64le
+libboost_headers:
+- '1.84'
 pin_run_as_build:
   python:
     min_pin: x.x
@@ -21,7 +27,9 @@ python_impl:
 target_platform:
 - linux-ppc64le
 zip_keys:
+- - c_stdlib_version
+  - cdt_name
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml
index 1c15caf..9e1b7dc 100644
--- a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml
+++ b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml
index 4ff4008..c78785c 100644
--- a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml
+++ b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml
index 8df779e..8f007ac 100644
--- a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml
+++ b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml
index c906997..55ffd5a 100644
--- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml
+++ b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml
index 8bc64d0..a450381 100644
--- a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml
+++ b/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml
index c4efdea..5989f12 100644
--- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml
+++ b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml
index e881a21..657b425 100644
--- a/.ci_support/osx_arm64_python3.10.____cpython.yaml
+++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml
index 7967251..a485535 100644
--- a/.ci_support/osx_arm64_python3.11.____cpython.yaml
+++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml
index d3da2bd..202418d 100644
--- a/.ci_support/osx_arm64_python3.12.____cpython.yaml
+++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml
index b6fd8e3..f484a2b 100644
--- a/.ci_support/osx_arm64_python3.8.____cpython.yaml
+++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml
index f86766b..4befab9 100644
--- a/.ci_support/osx_arm64_python3.9.____cpython.yaml
+++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml
@@ -1,5 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -7,7 +13,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '17'
+libboost_headers:
+- '1.84'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:
@@ -24,4 +32,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.gitattributes b/.gitattributes
index 7f32763..18f114a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,8 +20,8 @@ bld.bat text eol=crlf
 .travis.yml linguist-generated=true
 .scripts/* linguist-generated=true
 .woodpecker.yml linguist-generated=true
-LICENSE.txt linguist-generated=true
-README.md linguist-generated=true
+/LICENSE.txt linguist-generated=true
+/README.md linguist-generated=true
 azure-pipelines.yml linguist-generated=true
 build-locally.py linguist-generated=true
 shippable.yml linguist-generated=true
diff --git a/.gitignore b/.gitignore
index c002910..179afe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,22 @@
 # Everything else is managed by the conda-smithy rerender process.
 # Please do not modify
 
+# Ignore all files and folders in root
 *
 !/conda-forge.yml
 
-!/*/
+# Don't ignore any files/folders if the parent folder is 'un-ignored'
+# This also avoids warnings when adding an already-checked file with an ignored parent.
+!/**/
+# Don't ignore any files/folders recursively in the following folders
 !/recipe/**
 !/.ci_support/**
 
+# Since we ignore files/folders recursively, any folders inside
+# build_artifacts gets ignored which trips some build systems.
+# To avoid that we 'un-ignore' all files/folders recursively
+# and only ignore the root build_artifacts folder.
+!/build_artifacts/**
+/build_artifacts
+
 *.pyc
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index eba1dfd..ba4b251 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -34,9 +34,9 @@ CONDARC
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
@@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then
   cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt"
 fi
 
-if [[ "${sha:-}" == "" ]]; then
-  pushd ${FEEDSTOCK_ROOT}
-  sha=$(git rev-parse HEAD)
-  popd
-fi
-
 if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then
         EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}"
@@ -74,10 +68,16 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     # Drop into an interactive shell
     /bin/bash
 else
-    conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
+    conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \
         --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
+    ( startgroup "Inspecting artifacts" ) 2> /dev/null
+
+    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
+    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+
+    ( endgroup "Inspecting artifacts" ) 2> /dev/null
     ( startgroup "Validating outputs" ) 2> /dev/null
 
     validate_recipe_outputs "${FEEDSTOCK_NAME}"
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
index b70ef01..00f377a 100755
--- a/.scripts/run_docker_build.sh
+++ b/.scripts/run_docker_build.sh
@@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then
     export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT})
 fi
 
+if [[ "${sha:-}" == "" ]]; then
+  pushd "${FEEDSTOCK_ROOT}"
+  sha=$(git rev-parse HEAD)
+  popd
+fi
+
 docker info
 
 # In order for the conda-build process in the container to write to the mounted
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index 9259eb9..420f051 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3}
 ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
 
 MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download"
-MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh"
+MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh"
 curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}"
 rm -rf ${MINIFORGE_HOME}
 bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME}
@@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 
 
 
@@ -81,10 +81,17 @@ else
         EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
     fi
 
-    conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \
+    conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \
         --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha"
+
+    ( startgroup "Inspecting artifacts" ) 2> /dev/null
+
+    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
+    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+
+    ( endgroup "Inspecting artifacts" ) 2> /dev/null
     ( startgroup "Validating outputs" ) 2> /dev/null
 
     validate_recipe_outputs "${FEEDSTOCK_NAME}"
diff --git a/.travis.yml b/.travis.yml
index ece8043..f4afe0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 # This file was generated automatically from conda-smithy. To update this configuration,
 # update the conda-forge.yml and/or the recipe/meta.yaml.
 
-language: generic
+language: shell
 
 
 
-matrix:
+jobs:
   include:
     - env: CONFIG=linux_aarch64_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64
       os: linux
diff --git a/build-locally.py b/build-locally.py
index 3f4b7a7..d78427b 100755
--- a/build-locally.py
+++ b/build-locally.py
@@ -3,11 +3,11 @@
 # This file has been generated by conda-smithy in order to build the recipe
 # locally.
 #
-import os
 import glob
+import os
+import platform
 import subprocess
 from argparse import ArgumentParser
-import platform
 
 
 def setup_environment(ns):
@@ -64,8 +64,9 @@ def verify_config(ns):
     elif ns.config.startswith("osx"):
         if "OSX_SDK_DIR" not in os.environ:
             raise RuntimeError(
-                "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' "
-                "to download the SDK automatically to 'SDKs/MacOSX<ver>.sdk'. "
+                "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' "
+                "to download the SDK automatically to '$PWD/SDKs/MacOSX<ver>.sdk'. "
+                "Note: OSX_SDK_DIR must be set to an absolute path. "
                 "Setting this variable implies agreement to the licensing terms of the SDK by Apple."
             )
 
diff --git a/recipe/use-dumb-setup.py.patch b/recipe/0001-Simplify-setup.py.patch
similarity index 99%
rename from recipe/use-dumb-setup.py.patch
rename to recipe/0001-Simplify-setup.py.patch
index 4e70c39..1528c8b 100644
--- a/recipe/use-dumb-setup.py.patch
+++ b/recipe/0001-Simplify-setup.py.patch
@@ -1,7 +1,7 @@
-From a7ae7b979812e0fe4d09744a2a8be6e05955f7f1 Mon Sep 17 00:00:00 2001
+From 22f2d58e134ac2ee86f60ebe9cfb11c954b3248e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Fri, 8 Dec 2023 01:48:46 +0200
-Subject: [PATCH] Simplify setup.py
+Subject: [PATCH 01/11] Simplify setup.py
 
 ---
  setup.py | 334 -------------------------------------------------------
@@ -366,5 +366,5 @@ index e91e779..442dc12 100755
          "console_scripts": [
              "cling-config = cppyy_backend._cling_config:main",
 -- 
-2.43.0
+2.46.0
 
diff --git a/recipe/cross.patch b/recipe/0002-Do-not-use-llvm-config-when-cross-compiling.patch
similarity index 95%
rename from recipe/cross.patch
rename to recipe/0002-Do-not-use-llvm-config-when-cross-compiling.patch
index fd045af..332bf31 100644
--- a/recipe/cross.patch
+++ b/recipe/0002-Do-not-use-llvm-config-when-cross-compiling.patch
@@ -1,7 +1,7 @@
-From ad4eeb0ca1743848144dfe9f7eb2b08eabc8060d Mon Sep 17 00:00:00 2001
+From 71d61e2f6d73ad796194380b5f7443928bb6fc12 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Fri, 8 Dec 2023 02:03:00 +0200
-Subject: [PATCH] Do not use llvm-config when cross-compiling
+Subject: [PATCH 02/11] Do not use llvm-config when cross-compiling
 
 we cannot invoke a host binary.
 ---
@@ -82,5 +82,5 @@ index b74cee9..c109f52 100644
    set(LLVM_DIR "${LLVM_BINARY_DIR}")
  
 -- 
-2.43.0
+2.46.0
 
diff --git a/recipe/rootcling.patch b/recipe/0003-use-pre-built-dictionary-and-rootmap.patch
similarity index 94%
rename from recipe/rootcling.patch
rename to recipe/0003-use-pre-built-dictionary-and-rootmap.patch
index 2c3ad2e..56e2934 100644
--- a/recipe/rootcling.patch
+++ b/recipe/0003-use-pre-built-dictionary-and-rootmap.patch
@@ -1,18 +1,18 @@
-From 7374cfc8fbfb60282e1bf2e44508980f2459f63b Mon Sep 17 00:00:00 2001
+From 0572586ca3fab6abf248acfb808b6701923c4ec3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Mon, 21 Jun 2021 15:25:53 +0200
-Subject: [PATCH 1/2] use pre-built dictionary and rootmap
+Subject: [PATCH 03/11] use pre-built dictionary and rootmap
 
 ---
- src/CMakeLists.txt                 | 15 +++---------
+ src/CMakeLists.txt                 | 14 +++--------
  src/cmake/modules/RootMacros.cmake | 37 ++++++++++--------------------
- 2 files changed, 15 insertions(+), 37 deletions(-)
+ 2 files changed, 15 insertions(+), 36 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index afca457..b7e2cb6 100644
+index 948d387..3c1dac3 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -367,26 +367,18 @@ else()
+@@ -379,25 +379,17 @@ else()
    get_property(__pch_dependencies GLOBAL PROPERTY ROOT_PCH_DEPENDENCIES)
    get_property(__pch_dictionaries GLOBAL PROPERTY ROOT_PCH_DICTIONARIES)
  
@@ -41,7 +41,6 @@ index afca457..b7e2cb6 100644
    install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
  endif()
  
- # FIXME: move installation of PCMS in ROOT_GENERATE_DICTIONARY().
 diff --git a/src/cmake/modules/RootMacros.cmake b/src/cmake/modules/RootMacros.cmake
 index 3f7d9ee..85dc4b2 100644
 --- a/src/cmake/modules/RootMacros.cmake
@@ -118,5 +117,5 @@ index 3f7d9ee..85dc4b2 100644
  
    if(ARG_BUILTINS)
 -- 
-2.32.0
+2.46.0
 
diff --git a/recipe/clang-cpp.patch b/recipe/0004-link-against-libclangASTMatchers.patch
similarity index 82%
rename from recipe/clang-cpp.patch
rename to recipe/0004-link-against-libclangASTMatchers.patch
index 3bfbc83..0f11b71 100644
--- a/recipe/clang-cpp.patch
+++ b/recipe/0004-link-against-libclangASTMatchers.patch
@@ -1,7 +1,7 @@
-From d150efe4875657aba78a8369b31426749b5cd7da Mon Sep 17 00:00:00 2001
+From 2ab64b0412adc87086792233933d7330ee313e7a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Sun, 20 Jun 2021 18:05:30 +0200
-Subject: [PATCH] link against libclangASTMatchers
+Subject: [PATCH 04/11] link against libclangASTMatchers
 
 ---
  src/interpreter/cling/lib/Utils/CMakeLists.txt | 1 +
@@ -20,5 +20,5 @@ index 327c9ff..bdf8ee8 100644
    clangLex
  )
 -- 
-2.32.0
+2.46.0
 
diff --git a/recipe/pri.patch b/recipe/0005-make-sure-C-formatting-symbols-are-available-in-C.patch
similarity index 85%
rename from recipe/pri.patch
rename to recipe/0005-make-sure-C-formatting-symbols-are-available-in-C.patch
index 3a76d36..0ae327e 100644
--- a/recipe/pri.patch
+++ b/recipe/0005-make-sure-C-formatting-symbols-are-available-in-C.patch
@@ -1,7 +1,7 @@
-From 6133cd25d6c9e0e70340817cbeb35fddfabb598f Mon Sep 17 00:00:00 2001
+From d1ded278ca71ad26bc637abb77147ddb97c9528e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Mon, 21 Jun 2021 00:37:13 +0200
-Subject: [PATCH 1/2] make sure C formatting symbols are available in C++
+Subject: [PATCH 05/11] make sure C formatting symbols are available in C++
 
 ---
  src/core/metacling/src/TCling.cxx                         | 3 +++
@@ -9,7 +9,7 @@ Subject: [PATCH 1/2] make sure C formatting symbols are available in C++
  2 files changed, 6 insertions(+)
 
 diff --git a/src/core/metacling/src/TCling.cxx b/src/core/metacling/src/TCling.cxx
-index 38b9e4a..89f8c5e 100644
+index 5a827d5..c717efc 100644
 --- a/src/core/metacling/src/TCling.cxx
 +++ b/src/core/metacling/src/TCling.cxx
 @@ -17,6 +17,9 @@ Cling is a full ANSI compliant C++-11 interpreter based on
@@ -23,7 +23,7 @@ index 38b9e4a..89f8c5e 100644
  
  #include "ROOT/FoundationUtils.hxx"
 diff --git a/src/core/metacling/src/TClingRdictModuleFileExtension.cxx b/src/core/metacling/src/TClingRdictModuleFileExtension.cxx
-index 65f20f0..e06116d 100644
+index 74c5bdb..196943f 100644
 --- a/src/core/metacling/src/TClingRdictModuleFileExtension.cxx
 +++ b/src/core/metacling/src/TClingRdictModuleFileExtension.cxx
 @@ -15,6 +15,9 @@
@@ -37,5 +37,5 @@ index 65f20f0..e06116d 100644
  
  #include "TClingUtils.h"
 -- 
-2.32.0
+2.46.0
 
diff --git a/recipe/thread.patch b/recipe/0006-add-ThreadLocalStorage.h-directory.patch
similarity index 73%
rename from recipe/thread.patch
rename to recipe/0006-add-ThreadLocalStorage.h-directory.patch
index 2aedb78..dac3cba 100644
--- a/recipe/thread.patch
+++ b/recipe/0006-add-ThreadLocalStorage.h-directory.patch
@@ -1,14 +1,14 @@
-From b7557cb75d3f3213ffb024aa3793ec134b901209 Mon Sep 17 00:00:00 2001
+From 4021a38eef5886fe4aafd67645df0a2bf898bdb4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Mon, 21 Jun 2021 23:03:50 +0200
-Subject: [PATCH] add ThreadLocalStorage.h directory
+Subject: [PATCH 06/11] add ThreadLocalStorage.h directory
 
 ---
  src/core/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 42eefab..dcc81e4 100644
+index 8e3245b..b8a78bb 100644
 --- a/src/core/CMakeLists.txt
 +++ b/src/core/CMakeLists.txt
 @@ -55,6 +55,7 @@ include_directories(
@@ -20,5 +20,5 @@ index 42eefab..dcc81e4 100644
  
  set(objectlibs $<TARGET_OBJECTS:Base>
 -- 
-2.32.0
+2.46.0
 
diff --git a/recipe/system_dirs.patch b/recipe/0007-.patch
similarity index 97%
rename from recipe/system_dirs.patch
rename to recipe/0007-.patch
index d81f93e..c2e1362 100644
--- a/recipe/system_dirs.patch
+++ b/recipe/0007-.patch
@@ -1,13 +1,14 @@
-From 42fd6a5a849778c1b52cda97f80339daa6fa6067 Mon Sep 17 00:00:00 2001
+From 104ef9581d9a8aa1bc1f55be8f57cf2904938173 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Fri, 15 Sep 2023 13:50:02 +0200
+Subject: [PATCH 07/11]
 
 ---
  .../cling/lib/Interpreter/CIFactory.cpp       | 61 +++++++------------
  1 file changed, 21 insertions(+), 40 deletions(-)
 
 diff --git a/src/interpreter/cling/lib/Interpreter/CIFactory.cpp b/src/interpreter/cling/lib/Interpreter/CIFactory.cpp
-index e176259..074e778 100644
+index 2145c11..2304311 100644
 --- a/src/interpreter/cling/lib/Interpreter/CIFactory.cpp
 +++ b/src/interpreter/cling/lib/Interpreter/CIFactory.cpp
 @@ -93,13 +93,11 @@ namespace {
@@ -116,7 +117,7 @@ index e176259..074e778 100644
    #endif
  
          if (sArguments.empty()) {
-@@ -403,8 +372,20 @@ namespace {
+@@ -439,8 +408,20 @@ namespace {
  
  #endif // _MSC_VER
  
@@ -140,5 +141,5 @@ index e176259..074e778 100644
  
      for (auto& arg : sArguments) {
 -- 
-2.42.0
+2.46.0
 
diff --git a/recipe/aarch64.patch b/recipe/0008-clang-for-aarch64-does-not-support-march-native.patch
similarity index 82%
rename from recipe/aarch64.patch
rename to recipe/0008-clang-for-aarch64-does-not-support-march-native.patch
index c612522..9925641 100644
--- a/recipe/aarch64.patch
+++ b/recipe/0008-clang-for-aarch64-does-not-support-march-native.patch
@@ -1,14 +1,14 @@
-From ea356fa8bc8ee1d4776017f6dd3c615918d142ac Mon Sep 17 00:00:00 2001
+From 08bae13d27683d01529df21123b64a28cc59b90f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Fri, 1 Jul 2022 23:07:59 +0300
-Subject: [PATCH] clang for aarch64 does not support march=native
+Subject: [PATCH 08/11] clang for aarch64 does not support march=native
 
 ---
  python/cppyy_backend/loader.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/python/cppyy_backend/loader.py b/python/cppyy_backend/loader.py
-index f8fa1b1..e6b1585 100644
+index b6da3fe..a3845b8 100644
 --- a/python/cppyy_backend/loader.py
 +++ b/python/cppyy_backend/loader.py
 @@ -117,7 +117,7 @@ def set_cling_compile_options(add_defaults = False):
@@ -21,5 +21,5 @@ index f8fa1b1..e6b1585 100644
          else:
              CURRENT_ARGS += ' -O2'
 -- 
-2.36.1
+2.46.0
 
diff --git a/recipe/clangdriver.patch b/recipe/0009-Fix-order-of-clang-libraries.patch
similarity index 81%
rename from recipe/clangdriver.patch
rename to recipe/0009-Fix-order-of-clang-libraries.patch
index 4c3a0ae..f45031a 100644
--- a/recipe/clangdriver.patch
+++ b/recipe/0009-Fix-order-of-clang-libraries.patch
@@ -1,7 +1,7 @@
-From 465cc1fd17ba61bd81ad85159668a5fe3ef4547e Mon Sep 17 00:00:00 2001
+From 7ed0e7da29046f2c1a6dd96fe7b1b34fafa06494 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Tue, 20 Jun 2023 16:04:03 +0300
-Subject: [PATCH] Fix order of clang libraries
+Subject: [PATCH 09/11] Fix order of clang libraries
 
 clangFrontend needs symbols from clangDriver so it needs to come first
 ---
@@ -9,7 +9,7 @@ clangFrontend needs symbols from clangDriver so it needs to come first
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/interpreter/cling/lib/Interpreter/CMakeLists.txt b/src/interpreter/cling/lib/Interpreter/CMakeLists.txt
-index 1f15fa1..f7b93a4 100644
+index 87e8353..841f68b 100644
 --- a/src/interpreter/cling/lib/Interpreter/CMakeLists.txt
 +++ b/src/interpreter/cling/lib/Interpreter/CMakeLists.txt
 @@ -9,8 +9,8 @@
@@ -23,5 +23,5 @@ index 1f15fa1..f7b93a4 100644
    clangSema
    clangAnalysis
 -- 
-2.41.0
+2.46.0
 
diff --git a/recipe/remove-libLLVM.patch b/recipe/0010-Remove-libLLVM.so-when-linking.patch
similarity index 98%
rename from recipe/remove-libLLVM.patch
rename to recipe/0010-Remove-libLLVM.so-when-linking.patch
index f462f6e..8b051ef 100644
--- a/recipe/remove-libLLVM.patch
+++ b/recipe/0010-Remove-libLLVM.so-when-linking.patch
@@ -1,7 +1,7 @@
-From 4f64f7235479744b77d35a022b44db04acc46ec8 Mon Sep 17 00:00:00 2001
+From e5a02dd81059ee1d56e73237ffd6f105df0ce151 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
 Date: Fri, 15 Sep 2023 15:40:50 +0200
-Subject: [PATCH] Remove libLLVM.so when linking
+Subject: [PATCH 10/11] Remove libLLVM.so when linking
 
 ---
  src/core/metacling/src/CMakeLists.txt    |  4 +++-
@@ -92,5 +92,5 @@ index eb83eea..8530052 100644
  target_include_directories(rootcling PRIVATE
          ${CMAKE_CURRENT_SOURCE_DIR}/../core/metacling/res
 -- 
-2.43.0
+2.46.0
 
diff --git a/recipe/0011-Hardcode-C-include-path-from-host.patch b/recipe/0011-Hardcode-C-include-path-from-host.patch
new file mode 100644
index 0000000..b288171
--- /dev/null
+++ b/recipe/0011-Hardcode-C-include-path-from-host.patch
@@ -0,0 +1,65 @@
+From 480894c470185f68ac7a63e5594331ab85f5e93c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Julian=20R=C3=BCth?= <julian.rueth@fsfe.org>
+Date: Mon, 26 Aug 2024 19:55:45 +0300
+Subject: [PATCH 11/11] Hardcode C++ include path from host
+
+---
+ .../cling/lib/Interpreter/CIFactory.cpp       | 42 +------------------
+ 1 file changed, 1 insertion(+), 41 deletions(-)
+
+diff --git a/src/interpreter/cling/lib/Interpreter/CIFactory.cpp b/src/interpreter/cling/lib/Interpreter/CIFactory.cpp
+index 2304311..ed4ebc2 100644
+--- a/src/interpreter/cling/lib/Interpreter/CIFactory.cpp
++++ b/src/interpreter/cling/lib/Interpreter/CIFactory.cpp
+@@ -112,47 +112,7 @@ namespace {
+                                        llvm::SmallVectorImpl<char>& Buf,
+                                        AdditionalArgList& Args,
+                                        bool Verbose) {
+-    std::string CppInclQuery("LC_ALL=C ");
+-    CppInclQuery.append(Compiler);
+-
+-    CppInclQuery.append(" -xc++ -E -v /dev/null 2>&1 |"
+-                        " sed -n -e '/^.*include/,${' -e '/^ \\/.*++/p' -e '}'");
+-
+-    if (Verbose)
+-      cling::log() << "Looking for C++ headers with:\n  " << CppInclQuery << "\n";
+-
+-    if (FILE *PF = ::popen(CppInclQuery.c_str(), "r")) {
+-      Buf.resize(Buf.capacity_in_bytes());
+-      while (fgets(&Buf[0], Buf.capacity_in_bytes(), PF) && Buf[0]) {
+-        llvm::StringRef Path(&Buf[0]);
+-        // Skip leading and trailing whitespace
+-        Path = Path.trim();
+-        if (!Path.empty()) {
+-          if (!llvm::sys::fs::is_directory(Path)) {
+-            if (Verbose)
+-              cling::utils::LogNonExistantDirectory(Path);
+-          }
+-          else
+-            Args.addArgument("-cxx-isystem", Path.str());
+-        }
+-      }
+-      ::pclose(PF);
+-    } else {
+-      ::perror("popen failure");
+-      // Don't be overly verbose, we already printed the command
+-      if (!Verbose)
+-        cling::errs() << " for '" << CppInclQuery << "'\n";
+-    }
+-
+-    // Return the query in Buf on failure
+-    if (Args.empty()) {
+-      Buf.resize(0);
+-      Buf.insert(Buf.begin(), CppInclQuery.begin(), CppInclQuery.end());
+-    } else if (Verbose) {
+-      cling::log() << "Found:\n";
+-      for (const auto& Arg : Args)
+-        cling::log() << "  " << Arg.second << "\n";
+-    }
++    Args.addArgument("-cxx-isystem", std::string(::getenv("PREFIX")) + std::string("/include/c++/v1"));
+   }
+ 
+   static bool AddCxxPaths(llvm::StringRef PathStr, AdditionalArgList& Args,
+-- 
+2.46.0
+
diff --git a/recipe/build.sh b/recipe/build.sh
index 822cde5..8bab1d0 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -48,6 +48,7 @@ fi
 # Remove -std=c++XX from build ${CXXFLAGS}
 CXXFLAGS=$(echo "${CXXFLAGS}" | sed -E 's@-std=c\+\+[^ ]+@@g')
 CXXFLAGS=$(echo "${CXXFLAGS}" | sed -E 's@-isystem @-I@g')
+CXXFLAGS="$CXXFLAGS -Wno-enum-constexpr-conversion"
 export CXXFLAGS
 
 # ROOT uses these flags. Without them, we get relocation truncated to fit: R_PPC64_REL24 errors when lirking libCling
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 26465eb..cdcd2b4 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -1,6 +1,6 @@
-# pin clang<15 because cppyy (and cling) need an old enough libcxx, see
-# https://github.com/conda-forge/cppyy-feedstock/blob/main/recipe/meta.yaml
+# use a compiler that allows us to pin to a libcxx that is compatible with
+# https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml
 c_compiler_version:        # [osx]
-  - 14                     # [osx]
+  - 17                     # [osx]
 cxx_compiler_version:      # [osx]
-  - 14                     # [osx]
+  - 17                     # [osx]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 44e0c80..0378071 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -9,25 +9,26 @@ source:
   url: https://pypi.io/packages/source/c/cppyy-cling/cppyy-cling-{{ version }}.tar.gz
   sha256: 5d9e0551a4cb618eb3392001b3dc2c6294f02257f02fcd4d868999ba04f92af1
   patches:
-    - use-dumb-setup.py.patch
+    - 0001-Simplify-setup.py.patch
     # Disable use of llvm-config, a binary which we cannot install since it pulls in libllvm which breaks the build (also, we cannot use it when cross-compiling)
-    - cross.patch
+    - 0002-Do-not-use-llvm-config-when-cross-compiling.patch
     # Use pre-built generated files when we cannot invoke rootcling
-    - rootcling.patch  # [build_platform != target_platform]
-    - clang-cpp.patch
-    - pri.patch
-    - thread.patch
+    - 0003-use-pre-built-dictionary-and-rootmap.patch  # [build_platform != target_platform]
+    - 0004-link-against-libclangASTMatchers.patch
+    - 0005-make-sure-C-formatting-symbols-are-available-in-C.patch
+    - 0006-add-ThreadLocalStorage.h-directory.patch
     # Revert patch for non-macOS https://github.com/conda-forge/cppyy-cling-feedstock/pull/40#issuecomment-975781900
-    - system_dirs.patch  # [osx]
+    - 0007-.patch  # [osx]
     # Do not use -march=native on platforms that do not support it yet.
-    - aarch64.patch  # [aarch64]
+    - 0008-clang-for-aarch64-does-not-support-march-native.patch
     # Fix dependency resolution when building rootcling
-    - clangdriver.patch
+    - 0009-Fix-order-of-clang-libraries.patch
     # Fix https://github.com/conda-forge/cppyy-cling-feedstock/pull/56#issuecomment-1800307065
-    - remove-libLLVM.patch
+    - 0010-Remove-libLLVM.so-when-linking.patch
+    - 0011-Hardcode-C-include-path-from-host.patch  # [osx]
 
 build:
-  number: 2
+  number: 3
   skip: true  # [win]
   # cross-python does not support pypy yet
   skip: true  # [build_platform != target_platform and python_impl == "pypy"]
@@ -42,6 +43,7 @@ requirements:
     - python                                 # [build_platform != target_platform]
     - cross-python_{{ target_platform }}     # [build_platform != target_platform]
     - {{ compiler('cxx') }}
+    - {{ stdlib("c") }}
     - sed
     - cmake
     # We need a find that understand -name
@@ -51,9 +53,11 @@ requirements:
     - libboost-headers
     - python
     - pip
+    - setuptools
     - zlib
-    # There is no root_62701 build of clangdev so we use the latest build before that
-    - clangdev =13.0.1 root_63002*
+    - clangdev =13 root_63004*
+    # Same pin as clangdev
+    - libcxx {{ cxx_compiler_version }}  # [osx]
   run:
     # We need a C++ compiler at runtime to compile cppdef snippets and glue
     # code and also so that all the standard headers are available. We do not