diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 05deab8..e4427e1 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,6 +16,10 @@ jobs: 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_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0: + CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version14.0.6: CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version14.0.6 UPLOAD_PACKAGES: 'True' @@ -24,6 +28,10 @@ jobs: 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_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0: + CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f76d7bd..dc12ecf 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,24 +14,36 @@ jobs: 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_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0: + CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0 + UPLOAD_PACKAGES: 'True' osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version14.0.6: CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version14.0.6 UPLOAD_PACKAGES: 'True' 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_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0: + CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0 + UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version14.0.6: CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version14.0.6 UPLOAD_PACKAGES: 'True' 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_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0: + CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0 + UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version14.0.6: CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version14.0.6 UPLOAD_PACKAGES: 'True' 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_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0: + CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0.yaml b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0.yaml new file mode 100644 index 0000000..342ea73 --- /dev/null +++ b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0.yaml @@ -0,0 +1,35 @@ +CBUILD: +- x86_64-conda-linux-gnu +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_x86_64_apple_darwin13_4_0 +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cross_target_platform: +- osx-64 +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +macos_machine: +- x86_64-apple-darwin13.4.0 +meson_cpu_family: +- x86_64 +target_platform: +- linux-64 +uname_kernel_release: +- 13.4.0 +uname_machine: +- x86_64 +version: +- 16.0.0 +zip_keys: +- - cross_target_platform + - macos_machine + - meson_cpu_family + - uname_machine + - uname_kernel_release + - FINAL_PYTHON_SYSCONFIGDATA_NAME diff --git a/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0.yaml new file mode 100644 index 0000000..b9a297a --- /dev/null +++ b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0.yaml @@ -0,0 +1,35 @@ +CBUILD: +- x86_64-conda-linux-gnu +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_arm64_apple_darwin20_0_0 +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cross_target_platform: +- osx-arm64 +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +macos_machine: +- arm64-apple-darwin20.0.0 +meson_cpu_family: +- aarch64 +target_platform: +- linux-64 +uname_kernel_release: +- 20.0.0 +uname_machine: +- arm64 +version: +- 16.0.0 +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_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0.yaml new file mode 100644 index 0000000..ada1533 --- /dev/null +++ b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0.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: +- 16.0.0 +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_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0.yaml new file mode 100644 index 0000000..2ab3633 --- /dev/null +++ b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0.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: +- 16.0.0 +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_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0.yaml new file mode 100644 index 0000000..53ed75a --- /dev/null +++ b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0.yaml @@ -0,0 +1,31 @@ +CBUILD: +- arm64-apple-darwin20.0.0 +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_x86_64_apple_darwin13_4_0 +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +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-arm64 +uname_kernel_release: +- 13.4.0 +uname_machine: +- x86_64 +version: +- 16.0.0 +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_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0.yaml new file mode 100644 index 0000000..6210c97 --- /dev/null +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0.yaml @@ -0,0 +1,31 @@ +CBUILD: +- arm64-apple-darwin20.0.0 +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_arm64_apple_darwin20_0_0 +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +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-arm64 +uname_kernel_release: +- 20.0.0 +uname_machine: +- arm64 +version: +- 16.0.0 +zip_keys: +- - cross_target_platform + - macos_machine + - meson_cpu_family + - uname_machine + - uname_kernel_release + - FINAL_PYTHON_SYSCONFIGDATA_NAME diff --git a/README.md b/README.md index a7f91e3..0930f04 100644 --- a/README.md +++ b/README.md @@ -11,16 +11,16 @@ Home: http://github.com/conda-forge/clang-compiler-activation-feedstock Package license: BSD-3-Clause Summary: clang compilers for conda-build 3 -About clang_bootstrap_osx-arm64 -------------------------------- +About clang_bootstrap_osx-64 +---------------------------- Home: https://llvm.org Package license: Apache-2.0 Summary: clang compiler components in one package for bootstrapping clang -About clang_bootstrap_osx-64 ----------------------------- +About clang_bootstrap_osx-arm64 +------------------------------- Home: https://llvm.org @@ -59,6 +59,13 @@ Current build status variant + + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0 + + + variant + + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version14.0.6 @@ -73,6 +80,13 @@ Current build status variant + + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0 + + + variant + + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version14.0.6 @@ -87,6 +101,13 @@ Current build status variant + + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0 + + + variant + + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version14.0.6 @@ -101,6 +122,13 @@ Current build status variant + + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0 + + + variant + + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version14.0.6 @@ -115,6 +143,13 @@ Current build status variant + + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.0 + + + variant + + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version14.0.6 @@ -129,6 +164,13 @@ Current build status variant + + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.0 + + + variant + + diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index d62bf9d..8167179 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -11,6 +11,7 @@ MACOSX_DEPLOYMENT_TARGET: # [linux] version: - 14.0.6 - 15.0.7 + - 16.0.0 # everything below is zipped cross_target_platform: @@ -33,7 +34,8 @@ FINAL_PYTHON_SYSCONFIGDATA_NAME: - _sysconfigdata_arm64_apple_darwin20_0_0 zip_keys: - - - cross_target_platform + - + - cross_target_platform - macos_machine - meson_cpu_family - uname_machine diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 82fd266..cd72660 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,11 +1,13 @@ {% if version is not defined %} -{% set version = "15.0.7" %} +{% set version = "16.0.0" %} {% endif %} {% set major_ver = version.split(".")[0] %} -{% set build_number = 1 %} +{% set build_number = 0 %} # keep build number increments for old compiler versions as necessary -{% if major_ver | int <= 14 %} +{% if major_ver | int <= 15 %} +{% set build_number = build_number + 1 %} +{% elif major_ver | int <= 14 %} {% set build_number = build_number + 5 %} {% endif %}