Merge pull request #80 from h-vetinari/major

[main] Loosen run-export to major level
conda-forge · May 28, 2024 · 93de214 · 93de214
2 parents 4069a63 + d6788f0
commit 93de214
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 30 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/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.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:
@@ -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
@@ -4,6 +4,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+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/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -2,6 +2,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -12,3 +16,6 @@ docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
 - linux-ppc64le
+zip_keys:
+- - c_stdlib_version
+  - cdt_name
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,9 +1,15 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 c_compiler:
 - clang_bootstrap
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,9 +1,15 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang_bootstrap
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,10 +1,10 @@
 c_compiler:
 - vs2019
+c_stdlib:
+- vs
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 target_platform:
 - win-64
-vc:
-- '14'
diff --git a/.ci_support/win_arm64_.yaml b/.ci_support/win_arm64_.yaml
@@ -1,10 +1,10 @@
 c_compiler:
 - vs2022
+c_stdlib:
+- vs
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 target_platform:
 - win-arm64
-vc:
-- '14'
diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.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/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set version = "1.3.1" %}
-{% set build_num = 0 %}
+{% set build_num = 1 %}
 
 package:
   name: zlib-split
@@ -17,22 +17,21 @@ build:
 requirements:
   build:
     - cmake                 # [win]
-    - msinttypes              # [win and vc<14]
     # compiler on osx depends on zlib itself. Use the bootstrap compiler instead on osx
     - {{ compiler('c') }}
+    - {{ stdlib('c') }}
     - make                  # [unix]
   run:
 
 outputs:
   - name: libzlib
     build:
       run_exports:
-        # mostly OK, but some scary symbol removal.  Let's try for trusting them.
-        #  https://abi-laboratory.pro/tracker/timeline/zlib/
-        - {{ pin_subpackage('libzlib', max_pin='x.x') }}
+        - {{ pin_subpackage('libzlib', max_pin='x') }}
     requirements:
       build:
         - {{ compiler('c') }}
+        - {{ stdlib('c') }}
       host:
       run:
       run_constrained:
@@ -54,10 +53,11 @@ outputs:
     build:
       skip: true  # [not win]
       run_exports:
-        - {{ pin_subpackage('libzlib-wapi', max_pin='x.x') }}
+        - {{ pin_subpackage('libzlib-wapi', max_pin='x') }}
     requirements:
       build:
         - {{ compiler('c') }}
+        - {{ stdlib('c') }}
       host:
       run:
       run_constrained:
@@ -72,12 +72,11 @@ outputs:
   - name: zlib
     build:
       run_exports:
-        # mostly OK, but some scary symbol removal.  Let's try for trusting them.
-        #  https://abi-laboratory.pro/tracker/timeline/zlib/
-        - {{ pin_subpackage('libzlib', max_pin='x.x') }}
+        - {{ pin_subpackage('libzlib', max_pin='x') }}
     requirements:
       build:
         - {{ compiler('c') }}
+        - {{ stdlib('c') }}
       host:
         - {{ pin_subpackage('libzlib', exact=True) }}
       run:
@@ -116,10 +115,11 @@ outputs:
     build:
       skip: true  # [not win]
       run_exports:
-        - {{ pin_subpackage('libzlib-wapi', max_pin='x.x') }}
+        - {{ pin_subpackage('libzlib-wapi', max_pin='x') }}
     requirements:
       build:
         - {{ compiler('c') }}
+        - {{ stdlib('c') }}
       host:
         - {{ pin_subpackage('libzlib-wapi', exact=True) }}
         - {{ pin_subpackage('zlib', exact=True) }}