From d8065cb58ad61ab647aef33e7eea01e4dd6d835d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 7 Oct 2023 00:24:34 +1100 Subject: [PATCH 1/9] remove rc channels & sources --- recipe/conda_build_config.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 498c471..100b25a 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -20,16 +20,6 @@ version: - 16.0.6 - 17.0.0.rc3 -# zip to avoid using rc-builds for already-released-in-conda-forge LLVM versions -channel_sources: - - conda-forge - - conda-forge - - conda-forge/label/llvm_rc,conda-forge -channel_targets: - - conda-forge main - - conda-forge main - - conda-forge llvm_rc - # everything below is zipped cross_target_platform: - osx-64 @@ -61,5 +51,3 @@ zip_keys: - - version - MACOSX_DEPLOYMENT_TARGET # [osx and x86_64] - - channel_sources - - channel_targets From a734d6084c7eb69917068d873189a528011a0d30 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 1 Dec 2023 15:10:22 +1100 Subject: [PATCH 2/9] LLVM 17.0.6 --- recipe/conda_build_config.yaml | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 100b25a..9f729ef 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -18,7 +18,7 @@ MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] version: - 15.0.7 - 16.0.6 - - 17.0.0.rc3 + - 17.0.6 # everything below is zipped cross_target_platform: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 71476f8..3406468 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% if version is not defined %} -{% set version = "17.0.0.rc3" %} +{% set version = "17.0.6" %} {% endif %} {% set major_ver = version.split(".")[0] %} From 0e86222f72d9fcd4032a6c3e818f285688f5248c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 1 Dec 2023 15:17:37 +1100 Subject: [PATCH 3/9] Revert "bump MACOSX_DEPLOYMENT_TARGET to 10.13" This reverts commit fbf028c38e1d6544b5cef10962f88d35d36c740a. --- recipe/conda_build_config.yaml | 10 ---------- recipe/meta.yaml | 7 ------- 2 files changed, 17 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 9f729ef..fdd5811 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -7,13 +7,6 @@ CBUILD: MACOSX_DEPLOYMENT_TARGET: # [linux] - 10.9 # [linux] -MACOSX_SDK_VERSION: # [osx and x86_64] - - "10.13" # [osx and x86_64] -# as of LLVM 17, we need 10.13 for MACOSX_DEPLOYMENT_TARGET --> part of zip -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.9" # [osx and x86_64] - - "10.9" # [osx and x86_64] - - "10.13" # [osx and x86_64] version: - 15.0.7 @@ -48,6 +41,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME - - - - version - - MACOSX_DEPLOYMENT_TARGET # [osx and x86_64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3406468..03c893c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -80,7 +80,6 @@ outputs: - libcxx >={{ version }} - {{ pin_subpackage('clang_' ~ cross_target_platform, exact=True) }} - gxx_impl_{{ target_platform }} # [linux] - - __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64] test: commands: - echo {{ MACOSX_DEPLOYMENT_TARGET }} # [linux] @@ -107,10 +106,6 @@ outputs: run_exports: strong: - libcxx >={{ version }} - # strictly speaking the constraint on libcxx should be enough, - # but let's be nice to the solver and mark all libcxx-dependent - # packages as requiring 10.13 (for clangxx >= 17). - - __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64] - name: clang_bootstrap_{{ cross_target_platform }} script: install-clang-bootstrap.sh @@ -126,8 +121,6 @@ outputs: - {{ pin_subpackage('clangxx_' ~ cross_target_platform, exact=True) }} # hack to force the solver to work - libllvm{{ major_ver }} {{ version }} - run: - - __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64] build: always_include_files: - bin/ From db8e474173b3735d91c5de7d261a5911c78db516 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 1 Dec 2023 15:19:22 +1100 Subject: [PATCH 4/9] allow libcxx 16 for clang 17 --- recipe/meta.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 03c893c..81e89aa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,6 +2,10 @@ {% set version = "17.0.6" %} {% endif %} {% set major_ver = version.split(".")[0] %} +# cannot yet build libcxx 17 due to having no +# infrastructure to enforce `__osx >=10.13` properly, +# so allow the last major version of libcxx +{% set last_major = major_ver | int - 1 %} {% set build_number = 6 %} @@ -22,7 +26,7 @@ build: requirements: build: - cctools_{{ target_platform }} # [osx] - - libcxx {{ version }} + - libcxx {{ last_major }} - gcc_{{ target_platform }} # [linux] - clang {{ version }} # [osx] @@ -69,7 +73,7 @@ outputs: - cctools_{{ target_platform }} # [osx] host: - clangxx {{ version }} - - libcxx {{ version }} # [osx] + - libcxx {{ last_major }} # [osx] - {{ pin_subpackage('clang_impl_' ~ cross_target_platform, exact=True) }} - gxx_impl_{{ target_platform }} # [linux] # hack to force the solver to work @@ -77,7 +81,7 @@ outputs: run: - clangxx {{ version }} # This is not needed in Linux for cross-compiling in a conda-build env, but is needed outside - - libcxx >={{ version }} + - libcxx >={{ last_major }} - {{ pin_subpackage('clang_' ~ cross_target_platform, exact=True) }} - gxx_impl_{{ target_platform }} # [linux] test: @@ -105,7 +109,7 @@ outputs: # (here I would like the run dependency on clangxx to pull in the run_exports from it). run_exports: strong: - - libcxx >={{ version }} + - libcxx >={{ last_major }} - name: clang_bootstrap_{{ cross_target_platform }} script: install-clang-bootstrap.sh @@ -114,7 +118,7 @@ outputs: - cctools_{{ target_platform }} # [osx] host: - clangxx {{ version }} - - libcxx {{ version }} # [cross_target_platform in ("osx-64", "osx-arm64")] + - libcxx {{ last_major }} # [cross_target_platform in ("osx-64", "osx-arm64")] - cctools_{{ cross_target_platform }} - ld64_{{ cross_target_platform }} - {{ pin_subpackage('clang_' ~ cross_target_platform, exact=True) }} From bd60dcf3d16aea5f0a74e33c38979a95988f10c5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 1 Dec 2023 15:32:59 +1100 Subject: [PATCH 5/9] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.30.1, and conda-forge-pinning 2023.12.01.00.32.29 --- .azure-pipelines/azure-pipelines-linux.yml | 27 +++--- .azure-pipelines/azure-pipelines-osx.yml | 51 +++++------ ...6_64-apple-darwin13.4.0version15.0.7.yaml} | 3 - ...6_64-apple-darwin13.4.0version16.0.6.yaml} | 3 - ...6_64-apple-darwin13.4.0version17.0.6.yaml} | 9 +- ...rm64-apple-darwin20.0.0version15.0.7.yaml} | 3 - ...rm64-apple-darwin20.0.0version16.0.6.yaml} | 3 - ...rm64-apple-darwin20.0.0version17.0.6.yaml} | 9 +- ...4-apple-darwin13.4.0version17.0.0.rc3.yaml | 37 -------- ...4-apple-darwin20.0.0version17.0.0.rc3.yaml | 37 -------- ...6_64-apple-darwin13.4.0version15.0.7.yaml} | 6 -- ...6_64-apple-darwin13.4.0version16.0.6.yaml} | 6 -- ...86_64-apple-darwin13.4.0version17.0.6.yaml | 31 +++++++ ...rm64-apple-darwin20.0.0version15.0.7.yaml} | 6 -- ...rm64-apple-darwin20.0.0version16.0.6.yaml} | 6 -- ...arm64-apple-darwin20.0.0version17.0.6.yaml | 31 +++++++ ...6_64-apple-darwin13.4.0version15.0.7.yaml} | 3 - ...6_64-apple-darwin13.4.0version16.0.6.yaml} | 3 - ...6_64-apple-darwin13.4.0version17.0.6.yaml} | 9 +- ...rm64-apple-darwin20.0.0version15.0.7.yaml} | 3 - ...rm64-apple-darwin20.0.0version16.0.6.yaml} | 3 - ...rm64-apple-darwin20.0.0version17.0.6.yaml} | 9 +- .scripts/build_steps.sh | 11 ++- .scripts/run_docker_build.sh | 3 + .scripts/run_osx_build.sh | 9 +- README.md | 84 ++++++++++--------- 26 files changed, 181 insertions(+), 224 deletions(-) rename .ci_support/{linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml => linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml} (92%) rename .ci_support/{linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml => linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml} (92%) rename .ci_support/{linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml => linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml} (82%) rename .ci_support/{linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml => linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml} (92%) rename .ci_support/{linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml => linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml} (92%) rename .ci_support/{linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml => linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml} (82%) delete mode 100644 .ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml delete mode 100644 .ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml rename .ci_support/{osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml => osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml} (83%) rename .ci_support/{osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml => osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml} (83%) create mode 100644 .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml rename .ci_support/{osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml => osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml} (83%) rename .ci_support/{osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml => osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml} (83%) create mode 100644 .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml rename .ci_support/{osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml => osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml} (91%) rename .ci_support/{osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml => osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml} (91%) rename .ci_support/{osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml => osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml} (80%) rename .ci_support/{osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml => osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml} (91%) rename .ci_support/{osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml => osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml} (91%) rename .ci_support/{osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml => osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml} (80%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d842a81..666e4ef 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,28 +8,28 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - ? linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3 - : CONFIG: linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7: + CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3 - : CONFIG: linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: + CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7: - CONFIG: linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: + CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: - CONFIG: linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7: + CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7: - CONFIG: linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: + CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: - CONFIG: linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: + CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 @@ -45,6 +45,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7011dc9..e25267a 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,41 +8,41 @@ jobs: vmImage: macOS-11 strategy: matrix: - ? osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3 - : CONFIG: osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7: + CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7 UPLOAD_PACKAGES: 'True' - ? osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3 - : CONFIG: osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: + CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 UPLOAD_PACKAGES: 'True' - osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7: - CONFIG: osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: + CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 UPLOAD_PACKAGES: 'True' - osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: - CONFIG: osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7: + CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7 UPLOAD_PACKAGES: 'True' - osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7: - CONFIG: osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: + CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 UPLOAD_PACKAGES: 'True' - osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: - CONFIG: osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: + CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 UPLOAD_PACKAGES: 'True' - ? osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3 - : CONFIG: osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7: + CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7 UPLOAD_PACKAGES: 'True' - ? osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3 - : CONFIG: osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: + CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7: - CONFIG: osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: + CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: - CONFIG: osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7: + CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7 UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7: - CONFIG: osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: + CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: - CONFIG: osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: + CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 @@ -50,6 +50,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml similarity index 92% rename from .ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml rename to .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml index 267cdf7..71be49f 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml similarity index 92% rename from .ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml rename to .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml index cfff5f9..bad378b 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml similarity index 82% rename from .ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml rename to .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml index 43945ac..ca09d7e 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml @@ -7,9 +7,9 @@ MACOSX_DEPLOYMENT_TARGET: cdt_name: - cos6 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cross_target_platform: - osx-64 docker_image: @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 17.0.0.rc3 +- 17.0.6 zip_keys: - - cross_target_platform - macos_machine @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml similarity index 92% rename from .ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml index b1f15eb..f2b4c56 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml similarity index 92% rename from .ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml index 9287831..829761c 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml similarity index 82% rename from .ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml index 6f2b91c..736c82a 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml @@ -7,9 +7,9 @@ MACOSX_DEPLOYMENT_TARGET: cdt_name: - cos6 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cross_target_platform: - osx-arm64 docker_image: @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 17.0.0.rc3 +- 17.0.6 zip_keys: - - cross_target_platform - macos_machine @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml b/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml deleted file mode 100644 index 4112863..0000000 --- a/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml +++ /dev/null @@ -1,37 +0,0 @@ -CBUILD: -- x86_64-apple-darwin13.4.0 -FINAL_PYTHON_SYSCONFIGDATA_NAME: -- _sysconfigdata_x86_64_apple_darwin13_4_0 -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -channel_sources: -- conda-forge/label/llvm_rc,conda-forge -channel_targets: -- conda-forge llvm_rc -cross_target_platform: -- osx-64 -macos_machine: -- x86_64-apple-darwin13.4.0 -meson_cpu_family: -- x86_64 -target_platform: -- osx-64 -uname_kernel_release: -- 13.4.0 -uname_machine: -- x86_64 -version: -- 17.0.0.rc3 -zip_keys: -- - cross_target_platform - - macos_machine - - meson_cpu_family - - uname_machine - - uname_kernel_release - - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - MACOSX_DEPLOYMENT_TARGET - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml b/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml deleted file mode 100644 index a17edac..0000000 --- a/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml +++ /dev/null @@ -1,37 +0,0 @@ -CBUILD: -- x86_64-apple-darwin13.4.0 -FINAL_PYTHON_SYSCONFIGDATA_NAME: -- _sysconfigdata_arm64_apple_darwin20_0_0 -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -channel_sources: -- conda-forge/label/llvm_rc,conda-forge -channel_targets: -- conda-forge llvm_rc -cross_target_platform: -- osx-arm64 -macos_machine: -- arm64-apple-darwin20.0.0 -meson_cpu_family: -- aarch64 -target_platform: -- osx-64 -uname_kernel_release: -- 20.0.0 -uname_machine: -- arm64 -version: -- 17.0.0.rc3 -zip_keys: -- - cross_target_platform - - macos_machine - - meson_cpu_family - - uname_machine - - uname_kernel_release - - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - MACOSX_DEPLOYMENT_TARGET - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml similarity index 83% rename from .ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml rename to .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml index 25f8901..e2ecba1 100644 --- a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml @@ -4,8 +4,6 @@ FINAL_PYTHON_SYSCONFIGDATA_NAME: - _sysconfigdata_x86_64_apple_darwin13_4_0 MACOSX_DEPLOYMENT_TARGET: - '10.9' -MACOSX_SDK_VERSION: -- '10.13' channel_sources: - conda-forge channel_targets: @@ -31,7 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - MACOSX_DEPLOYMENT_TARGET - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml similarity index 83% rename from .ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml rename to .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml index 3421892..7d340c9 100644 --- a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml @@ -4,8 +4,6 @@ FINAL_PYTHON_SYSCONFIGDATA_NAME: - _sysconfigdata_x86_64_apple_darwin13_4_0 MACOSX_DEPLOYMENT_TARGET: - '10.9' -MACOSX_SDK_VERSION: -- '10.13' channel_sources: - conda-forge channel_targets: @@ -31,7 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - MACOSX_DEPLOYMENT_TARGET - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml new file mode 100644 index 0000000..7c816bd --- /dev/null +++ b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml @@ -0,0 +1,31 @@ +CBUILD: +- x86_64-apple-darwin13.4.0 +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_x86_64_apple_darwin13_4_0 +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cross_target_platform: +- osx-64 +macos_machine: +- x86_64-apple-darwin13.4.0 +meson_cpu_family: +- x86_64 +target_platform: +- osx-64 +uname_kernel_release: +- 13.4.0 +uname_machine: +- x86_64 +version: +- 17.0.6 +zip_keys: +- - cross_target_platform + - macos_machine + - meson_cpu_family + - uname_machine + - uname_kernel_release + - FINAL_PYTHON_SYSCONFIGDATA_NAME diff --git a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml similarity index 83% rename from .ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml rename to .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml index bb863bf..de9362b 100644 --- a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml @@ -4,8 +4,6 @@ FINAL_PYTHON_SYSCONFIGDATA_NAME: - _sysconfigdata_arm64_apple_darwin20_0_0 MACOSX_DEPLOYMENT_TARGET: - '10.9' -MACOSX_SDK_VERSION: -- '10.13' channel_sources: - conda-forge channel_targets: @@ -31,7 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - MACOSX_DEPLOYMENT_TARGET - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml similarity index 83% rename from .ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml rename to .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml index ecf4c08..8b27ddc 100644 --- a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml @@ -4,8 +4,6 @@ FINAL_PYTHON_SYSCONFIGDATA_NAME: - _sysconfigdata_arm64_apple_darwin20_0_0 MACOSX_DEPLOYMENT_TARGET: - '10.9' -MACOSX_SDK_VERSION: -- '10.13' channel_sources: - conda-forge channel_targets: @@ -31,7 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - MACOSX_DEPLOYMENT_TARGET - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml new file mode 100644 index 0000000..6a845fd --- /dev/null +++ b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml @@ -0,0 +1,31 @@ +CBUILD: +- x86_64-apple-darwin13.4.0 +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_arm64_apple_darwin20_0_0 +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cross_target_platform: +- osx-arm64 +macos_machine: +- arm64-apple-darwin20.0.0 +meson_cpu_family: +- aarch64 +target_platform: +- osx-64 +uname_kernel_release: +- 20.0.0 +uname_machine: +- arm64 +version: +- 17.0.6 +zip_keys: +- - cross_target_platform + - macos_machine + - meson_cpu_family + - uname_machine + - uname_kernel_release + - FINAL_PYTHON_SYSCONFIGDATA_NAME diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml similarity index 91% rename from .ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml index d9cf1a6..f11372f 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml similarity index 91% rename from .ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml index 3d8c439..b87999f 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml similarity index 80% rename from .ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml index cd3c55b..d64f784 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml @@ -5,9 +5,9 @@ FINAL_PYTHON_SYSCONFIGDATA_NAME: MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cross_target_platform: - osx-64 macos_machine: @@ -21,7 +21,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 17.0.0.rc3 +- 17.0.6 zip_keys: - - cross_target_platform - macos_machine @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml similarity index 91% rename from .ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml index 1c17d7c..4c86196 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml similarity index 91% rename from .ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml index b015a9f..f9573d0 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml similarity index 80% rename from .ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml index 68d5f7b..9fce86d 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml @@ -5,9 +5,9 @@ FINAL_PYTHON_SYSCONFIGDATA_NAME: MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cross_target_platform: - osx-arm64 macos_machine: @@ -21,7 +21,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 17.0.0.rc3 +- 17.0.6 zip_keys: - - cross_target_platform - macos_machine @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f703d9a..26e02a9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,8 +28,10 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba 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=3 "py-lief<0.12" @@ -55,6 +57,12 @@ 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}" @@ -68,7 +76,8 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( 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 9236239..b70ef01 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index a536cb1..cca8e03 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,6 +22,8 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +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=3 "py-lief<0.12" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -77,7 +83,8 @@ else conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index d5cb81b..3a53ac9 100644 --- a/README.md +++ b/README.md @@ -49,129 +49,129 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -189,8 +189,12 @@ Current release info | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang_bootstrap_osx--64-green.svg)](https://anaconda.org/conda-forge/clang_bootstrap_osx-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang_bootstrap_osx-64.svg)](https://anaconda.org/conda-forge/clang_bootstrap_osx-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang_bootstrap_osx-64.svg)](https://anaconda.org/conda-forge/clang_bootstrap_osx-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang_bootstrap_osx-64.svg)](https://anaconda.org/conda-forge/clang_bootstrap_osx-64) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang_bootstrap_osx--arm64-green.svg)](https://anaconda.org/conda-forge/clang_bootstrap_osx-arm64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang_bootstrap_osx-arm64.svg)](https://anaconda.org/conda-forge/clang_bootstrap_osx-arm64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang_bootstrap_osx-arm64.svg)](https://anaconda.org/conda-forge/clang_bootstrap_osx-arm64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang_bootstrap_osx-arm64.svg)](https://anaconda.org/conda-forge/clang_bootstrap_osx-arm64) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang_impl_osx--64-green.svg)](https://anaconda.org/conda-forge/clang_impl_osx-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang_impl_osx-64.svg)](https://anaconda.org/conda-forge/clang_impl_osx-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang_impl_osx-64.svg)](https://anaconda.org/conda-forge/clang_impl_osx-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang_impl_osx-64.svg)](https://anaconda.org/conda-forge/clang_impl_osx-64) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang_impl_osx--arm64-green.svg)](https://anaconda.org/conda-forge/clang_impl_osx-arm64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang_impl_osx-arm64.svg)](https://anaconda.org/conda-forge/clang_impl_osx-arm64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang_impl_osx-arm64.svg)](https://anaconda.org/conda-forge/clang_impl_osx-arm64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang_impl_osx-arm64.svg)](https://anaconda.org/conda-forge/clang_impl_osx-arm64) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang_osx--64-green.svg)](https://anaconda.org/conda-forge/clang_osx-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang_osx-64.svg)](https://anaconda.org/conda-forge/clang_osx-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang_osx-64.svg)](https://anaconda.org/conda-forge/clang_osx-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang_osx-64.svg)](https://anaconda.org/conda-forge/clang_osx-64) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang_osx--arm64-green.svg)](https://anaconda.org/conda-forge/clang_osx-arm64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang_osx-arm64.svg)](https://anaconda.org/conda-forge/clang_osx-arm64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang_osx-arm64.svg)](https://anaconda.org/conda-forge/clang_osx-arm64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang_osx-arm64.svg)](https://anaconda.org/conda-forge/clang_osx-arm64) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clangxx_impl_osx--64-green.svg)](https://anaconda.org/conda-forge/clangxx_impl_osx-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangxx_impl_osx-64.svg)](https://anaconda.org/conda-forge/clangxx_impl_osx-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangxx_impl_osx-64.svg)](https://anaconda.org/conda-forge/clangxx_impl_osx-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangxx_impl_osx-64.svg)](https://anaconda.org/conda-forge/clangxx_impl_osx-64) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clangxx_impl_osx--arm64-green.svg)](https://anaconda.org/conda-forge/clangxx_impl_osx-arm64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangxx_impl_osx-arm64.svg)](https://anaconda.org/conda-forge/clangxx_impl_osx-arm64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangxx_impl_osx-arm64.svg)](https://anaconda.org/conda-forge/clangxx_impl_osx-arm64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangxx_impl_osx-arm64.svg)](https://anaconda.org/conda-forge/clangxx_impl_osx-arm64) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangxx_osx--64-green.svg)](https://anaconda.org/conda-forge/clangxx_osx-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangxx_osx-64.svg)](https://anaconda.org/conda-forge/clangxx_osx-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangxx_osx-64.svg)](https://anaconda.org/conda-forge/clangxx_osx-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangxx_osx-64.svg)](https://anaconda.org/conda-forge/clangxx_osx-64) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangxx_osx--arm64-green.svg)](https://anaconda.org/conda-forge/clangxx_osx-arm64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangxx_osx-arm64.svg)](https://anaconda.org/conda-forge/clangxx_osx-arm64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangxx_osx-arm64.svg)](https://anaconda.org/conda-forge/clangxx_osx-arm64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangxx_osx-arm64.svg)](https://anaconda.org/conda-forge/clangxx_osx-arm64) | @@ -204,16 +208,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `clang_bootstrap_osx-64, clang_bootstrap_osx-arm64, clang_osx-64, clang_osx-arm64, clangxx_osx-64, clangxx_osx-arm64` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `clang_bootstrap_osx-64, clang_bootstrap_osx-arm64, clang_impl_osx-64, clang_impl_osx-arm64, clang_osx-64, clang_osx-arm64, clangxx_impl_osx-64, clangxx_impl_osx-arm64, clangxx_osx-64, clangxx_osx-arm64` can be installed with `conda`: ``` -conda install clang_bootstrap_osx-64 clang_bootstrap_osx-arm64 clang_osx-64 clang_osx-arm64 clangxx_osx-64 clangxx_osx-arm64 +conda install clang_bootstrap_osx-64 clang_bootstrap_osx-arm64 clang_impl_osx-64 clang_impl_osx-arm64 clang_osx-64 clang_osx-arm64 clangxx_impl_osx-64 clangxx_impl_osx-arm64 clangxx_osx-64 clangxx_osx-arm64 ``` or with `mamba`: ``` -mamba install clang_bootstrap_osx-64 clang_bootstrap_osx-arm64 clang_osx-64 clang_osx-arm64 clangxx_osx-64 clangxx_osx-arm64 +mamba install clang_bootstrap_osx-64 clang_bootstrap_osx-arm64 clang_impl_osx-64 clang_impl_osx-arm64 clang_osx-64 clang_osx-arm64 clangxx_impl_osx-64 clangxx_impl_osx-arm64 clangxx_osx-64 clangxx_osx-arm64 ``` It is possible to list all of the versions of `clang_bootstrap_osx-64` available on your platform with `conda`: @@ -260,7 +264,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance From 6bd78be52d6556ffd4c0848e86e9d39077d17e28 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 1 Dec 2023 15:33:17 +1100 Subject: [PATCH 6/9] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 81e89aa..3a63f13 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,7 +7,7 @@ # so allow the last major version of libcxx {% set last_major = major_ver | int - 1 %} -{% set build_number = 6 %} +{% set build_number = 7 %} package: name: clang-compiler-activation From f2e8fa017f70bee6cba06b9dd25b549acd8f76c8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 3 Dec 2023 13:41:58 +1100 Subject: [PATCH 7/9] don't try to create already-existing symlink --- recipe/install-clang.sh | 4 +++- recipe/install-clangxx.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/install-clang.sh b/recipe/install-clang.sh index b37743f..62a15bf 100644 --- a/recipe/install-clang.sh +++ b/recipe/install-clang.sh @@ -6,7 +6,9 @@ CHOST=${macos_machine} pushd "${PREFIX}"/bin ln -s clang ${CHOST}-clang - if [[ "${CBUILD}" != ${CHOST} ]]; then + if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* ]]; then + # on linux, the `clang` package already has a $TRIPLE-clang, see + # https://github.com/conda-forge/clangdev-feedstock/pull/251 ln -s clang ${CBUILD}-clang fi popd diff --git a/recipe/install-clangxx.sh b/recipe/install-clangxx.sh index 98ee7e4..cd38846 100644 --- a/recipe/install-clangxx.sh +++ b/recipe/install-clangxx.sh @@ -7,7 +7,9 @@ echo CHOST is ${CHOST} pushd "${PREFIX}"/bin ln -s clang++ ${CHOST}-clang++ - if [[ "${CHOST}" != "${CBUILD}" ]]; then + if [[ "${CHOST}" != "${CBUILD}" ]] && [[ "${target_platform}" != linux-* ]]; then + # on linux, the `clangxx` package already has a $TRIPLE-clang++, see + # https://github.com/conda-forge/clangdev-feedstock/pull/251 ln -s clang++ ${CBUILD}-clang++ fi popd From 610d6c3fe52d2a559af3bd0c409b83e42f475942 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 5 Dec 2023 17:38:36 -0600 Subject: [PATCH 8/9] Update condition for prefixed clang --- recipe/install-clangxx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/install-clangxx.sh b/recipe/install-clangxx.sh index cd38846..a592e96 100644 --- a/recipe/install-clangxx.sh +++ b/recipe/install-clangxx.sh @@ -7,7 +7,7 @@ echo CHOST is ${CHOST} pushd "${PREFIX}"/bin ln -s clang++ ${CHOST}-clang++ - if [[ "${CHOST}" != "${CBUILD}" ]] && [[ "${target_platform}" != linux-* ]]; then + if [[ "${CHOST}" != "${CBUILD}" ]] && [[ "${target_platform}" != linux-* || ${version} == "15.0.7" ]]; then # on linux, the `clangxx` package already has a $TRIPLE-clang++, see # https://github.com/conda-forge/clangdev-feedstock/pull/251 ln -s clang++ ${CBUILD}-clang++ From 2f711743776b0d42ac17d7099bc55b7c4fd0565f Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Wed, 6 Dec 2023 10:57:34 +1100 Subject: [PATCH 9/9] also add version-check for clang symlink --- recipe/install-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/install-clang.sh b/recipe/install-clang.sh index 62a15bf..23a0468 100644 --- a/recipe/install-clang.sh +++ b/recipe/install-clang.sh @@ -6,7 +6,7 @@ CHOST=${macos_machine} pushd "${PREFIX}"/bin ln -s clang ${CHOST}-clang - if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* ]]; then + if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* || ${version} == "15.0.7" ]]; then # on linux, the `clang` package already has a $TRIPLE-clang, see # https://github.com/conda-forge/clangdev-feedstock/pull/251 ln -s clang ${CBUILD}-clang
VariantStatus
linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7 - variant + variant
linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 - variant + variant
linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 - variant + variant
linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7 - variant + variant
linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 - variant + variant
linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 - variant + variant
osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7 - variant + variant
osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 - variant + variant
osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 - variant + variant
osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7 - variant + variant
osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 - variant + variant
osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 - variant + variant
osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.0.rc3osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7 - variant + variant
osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.0.rc3osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 - variant + variant
osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version15.0.7osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 - variant + variant
osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7 - variant + variant
osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version15.0.7osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 - variant + variant
osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 - variant + variant