From d36bc1458fd534769adcdb76be50fc83f87dc90c Mon Sep 17 00:00:00 2001
From: John Kerl <kerl.john.@gmail.com>
Date: Wed, 27 Mar 2024 17:58:41 +0000
Subject: [PATCH] finish up

---
 .azure-pipelines/azure-pipelines-linux.yml | 1 +
 .azure-pipelines/azure-pipelines-osx.yml   | 1 +
 .ci_support/linux_64_fmt10spdlog1.12.yaml  | 6 ++++++
 .ci_support/linux_64_fmt9spdlog1.11.yaml   | 6 ++++++
 .ci_support/osx_64_.yaml                   | 6 ++++++
 .ci_support/osx_arm64_.yaml                | 6 ++++++
 .scripts/build_steps.sh                    | 2 +-
 .scripts/run_osx_build.sh                  | 2 +-
 8 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index cc2ad41..8ebd125 100755
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -17,6 +17,7 @@ jobs:
         UPLOAD_PACKAGES: 'True'
         DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
   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 008b3dc..05bcf0f 100755
--- a/.azure-pipelines/azure-pipelines-osx.yml
+++ b/.azure-pipelines/azure-pipelines-osx.yml
@@ -15,6 +15,7 @@ jobs:
         CONFIG: osx_arm64_
         UPLOAD_PACKAGES: 'True'
   timeoutInMinutes: 360
+  variables: {}
 
   steps:
   # TODO: Fast finish on azure pipelines?
diff --git a/.ci_support/linux_64_fmt10spdlog1.12.yaml b/.ci_support/linux_64_fmt10spdlog1.12.yaml
index a01c1d9..56938cb 100644
--- a/.ci_support/linux_64_fmt10spdlog1.12.yaml
+++ b/.ci_support/linux_64_fmt10spdlog1.12.yaml
@@ -2,6 +2,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -43,6 +47,8 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 - - channel_sources
   - fmt
   - spdlog
diff --git a/.ci_support/linux_64_fmt9spdlog1.11.yaml b/.ci_support/linux_64_fmt9spdlog1.11.yaml
index 3351eaf..5fd75be 100644
--- a/.ci_support/linux_64_fmt9spdlog1.11.yaml
+++ b/.ci_support/linux_64_fmt9spdlog1.11.yaml
@@ -2,6 +2,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -43,6 +47,8 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 - - channel_sources
   - fmt
   - spdlog
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
index d399ee1..8b20792 100644
--- a/.ci_support/osx_64_.yaml
+++ b/.ci_support/osx_64_.yaml
@@ -6,6 +6,10 @@ c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge,tiledb
 channel_targets:
@@ -45,5 +49,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - MACOSX_DEPLOYMENT_TARGET
 - - python
   - numpy
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
index b5d8c8a..da840f3 100644
--- a/.ci_support/osx_arm64_.yaml
+++ b/.ci_support/osx_arm64_.yaml
@@ -4,6 +4,10 @@ c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge,tiledb
 channel_targets:
@@ -43,5 +47,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - MACOSX_DEPLOYMENT_TARGET
 - - python
   - numpy
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index 9121002..899ba03 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     # Drop into an interactive shell
     /bin/bash
 else
-    conda build "${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:-}"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index 16daa69..07dff21 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -81,7 +81,7 @@ else
         EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
     fi
 
-    conda build ./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"