Merge pull request #6 from mcbarton/main

Fix Linux arm build
conda-forge · Mar 26, 2024 · 292b16e · 292b16e
2 parents 28bc03a + 86af518
commit 292b16e
Show file tree

Hide file tree

Showing 19 changed files with 154 additions and 26 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,3 +1,7 @@
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -12,3 +16,6 @@ docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
 - linux-64
+zip_keys:
+- - c_stdlib_version
+  - cdt_name
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -1,5 +1,9 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -16,3 +20,6 @@ docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
 target_platform:
 - linux-aarch64
+zip_keys:
+- - c_stdlib_version
+  - cdt_name
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,5 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.9'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -12,3 +16,6 @@ macos_machine:
 - x86_64-apple-darwin13.4.0
 target_platform:
 - osx-64
+zip_keys:
+- - c_stdlib_version
+  - MACOSX_DEPLOYMENT_TARGET
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,5 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -12,3 +16,6 @@ macos_machine:
 - arm64-apple-darwin20.0.0
 target_platform:
 - osx-arm64
+zip_keys:
+- - c_stdlib_version
+  - MACOSX_DEPLOYMENT_TARGET
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,3 +1,5 @@
+c_stdlib:
+- vs
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,5 +1,6 @@
-build_platform:
-  osx_arm64: osx_64
+build_platform: {osx_arm64: osx_64}
+conda_forge_output_validation: true
+provider: {linux_aarch64: default, win: azure}
 conda_build:
   pkg_format: '2'
 conda_forge_output_validation: true

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -10,7 +10,7 @@ source:
   sha256: ba7b465759bb01069d57302855eaf4d1f7d677f21ad7b0b00b92939645c30f47
 
 build:
-  number: 1
+  number: 2
 
 requirements:
   build: