From 4e83b3386cb32c2f5407b7891d1f19ee6e77f611 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 16:50:47 +0000 Subject: [PATCH 01/29] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning off CI for master to main migration --- .circleci/config.yml | 1 + azure-pipelines.yml => azure-pipelines.yml.bak | 0 2 files changed, 1 insertion(+) rename azure-pipelines.yml => azure-pipelines.yml.bak (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..cf397d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,3 +1,4 @@ + # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- diff --git a/azure-pipelines.yml b/azure-pipelines.yml.bak similarity index 100% rename from azure-pipelines.yml rename to azure-pipelines.yml.bak From ab74e85cffe68ae31a6693509457efbeb712d92d Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 16:50:53 +0000 Subject: [PATCH 02/29] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning on CI for master to main migration --- .circleci/config.yml | 1 - azure-pipelines.yml.bak => azure-pipelines.yml | 0 2 files changed, 1 deletion(-) rename azure-pipelines.yml.bak => azure-pipelines.yml (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf397d5..6ad461b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,3 @@ - # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- diff --git a/azure-pipelines.yml.bak b/azure-pipelines.yml similarity index 100% rename from azure-pipelines.yml.bak rename to azure-pipelines.yml From 537b74b6b6414c34fa0a236a0de3a007e00fbeee Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 16:50:54 +0000 Subject: [PATCH 03/29] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeMasterToMain --- .github/workflows/automerge.yml | 2 +- .github/workflows/webservices.yml | 2 +- conda-forge.yml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f79fe85..773b3d1 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v2 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@master + uses: conda-forge/automerge-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index 2e5fe71..d6f06b5 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,7 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@master + uses: conda-forge/webservices-dispatch-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/conda-forge.yml b/conda-forge.yml index 8c9b403..836526b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,3 +3,6 @@ channel_priority: flexible conda_forge_output_validation: true provider: {linux_aarch64: azure, linux_ppc64le: azure} test_on_native_only: true +github: + branch_name: main + tooling_branch_name: main From a20f0075b16c8eee610fdbd256aabf150e561898 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Mar 2022 06:35:39 +0000 Subject: [PATCH 04/29] updated v14.0.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 49f1de2..b05dc71 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "13.0.1" %} +{% set version = "14.0.0" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 326335a830f2e32d06d0a36393b5455d17dc73e0bd1211065227ee014f92cbf8 + sha256: 35ce9edbc8f774fe07c8f4acdf89ec8ac695c8016c165dd86b8d10e7cba07e23 patches: - patches/0001-Set-LLVM-directories.patch - patches/0002-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 9216b365651a91c922205b92e1261d5bf4dce3c3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Mar 2022 06:36:10 +0000 Subject: [PATCH 05/29] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.18.0, and conda-forge-pinning 2022.03.22.19.17.12 --- .ci_support/README | 12 ++++++------ .ci_support/linux_64_.yaml | 5 ----- .ci_support/linux_aarch64_.yaml | 5 ----- .ci_support/linux_ppc64le_.yaml | 5 ----- README.md | 30 +++++++++++++++--------------- 5 files changed, 21 insertions(+), 36 deletions(-) diff --git a/.ci_support/README b/.ci_support/README index 69c5db6..a47316b 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1,6 +1,6 @@ -This file is automatically generated by conda-smithy. If any -particular build configuration is expected, but it is not found, -please make sure all dependencies are satisfiable. To add/modify any -matrix elements, you should create/change conda-smithy's input -recipe/conda_build_config.yaml and re-render the recipe, rather than -editing these files directly. +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 3c525fb..0e10e96 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -14,9 +14,6 @@ cxx_compiler_version: - '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - zlib: - max_pin: x.x target_platform: - linux-64 vc: @@ -24,5 +21,3 @@ vc: zip_keys: - - c_compiler_version - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 99214b6..e77aaa6 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -18,9 +18,6 @@ cxx_compiler_version: - '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 -pin_run_as_build: - zlib: - max_pin: x.x target_platform: - linux-aarch64 vc: @@ -28,5 +25,3 @@ vc: zip_keys: - - c_compiler_version - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 1cc02a8..51edf73 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -14,9 +14,6 @@ cxx_compiler_version: - '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - zlib: - max_pin: x.x target_platform: - linux-ppc64le vc: @@ -24,5 +21,3 @@ vc: zip_keys: - - c_compiler_version - cxx_compiler_version -zlib: -- '1.2' diff --git a/README.md b/README.md index 3788f41..ea68ebf 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: http://llvm.org/ Package license: NCSA -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/lld-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/lld-feedstock/blob/main/LICENSE.txt) Summary: The LLVM Linker @@ -20,8 +20,8 @@ Current build status
- - + + @@ -29,43 +29,43 @@ Current build status From 30b3945c6d7338bc9d50d506258c3d0b56afc510 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Mar 2022 19:22:11 +1100 Subject: [PATCH 06/29] remove rc channel sources & targets --- recipe/conda_build_config.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 23a59c8..a253f42 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -12,9 +12,3 @@ c_compiler_version: # [osx] - "*" # [osx] cxx_compiler_version: # [osx] - "*" # [osx] - -channel_targets: - - conda-forge llvm_rc - -channel_sources: - - conda-forge/label/llvm_rc,conda-forge From c0e613d165ceaf2928f92cd883a5675de0e12a5c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Mar 2022 19:23:29 +1100 Subject: [PATCH 07/29] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.18.0, and conda-forge-pinning 2022.03.23.07.48.24 --- .ci_support/README | 12 ++++++------ .ci_support/linux_64_.yaml | 9 +++++++-- .ci_support/linux_aarch64_.yaml | 9 +++++++-- .ci_support/linux_ppc64le_.yaml | 9 +++++++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/.ci_support/README b/.ci_support/README index a47316b..69c5db6 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1,6 +1,6 @@ -This file is automatically generated by conda-smithy. If any -particular build configuration is expected, but it is not found, -please make sure all dependencies are satisfiable. To add/modify any -matrix elements, you should create/change conda-smithy's input -recipe/conda_build_config.yaml and re-render the recipe, rather than -editing these files directly. +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 96fc2d6..3c525fb 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,15 +5,18 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: - '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + zlib: + max_pin: x.x target_platform: - linux-64 vc: @@ -21,3 +24,5 @@ vc: zip_keys: - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 53e7f52..99214b6 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -9,15 +9,18 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: - '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 +pin_run_as_build: + zlib: + max_pin: x.x target_platform: - linux-aarch64 vc: @@ -25,3 +28,5 @@ vc: zip_keys: - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index a847525..1cc02a8 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,15 +5,18 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: - '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le +pin_run_as_build: + zlib: + max_pin: x.x target_platform: - linux-ppc64le vc: @@ -21,3 +24,5 @@ vc: zip_keys: - - c_compiler_version - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 9687e3f..9a2f26b 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,9 +5,9 @@ c_compiler: c_compiler_version: - '*' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3a30ab0..f501f6f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,9 +5,9 @@ c_compiler: c_compiler_version: - '*' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index d240aaf..fdbb760 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,9 +1,9 @@ c_compiler: - vs2019 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - vs2019 libxml2: From d88f2b38eee05474dfcc26c23a5394030338d3c6 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 00:35:31 +0000 Subject: [PATCH 08/29] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.04.26.15.08.43 --- .ci_support/README | 12 ++++++------ README.md | 39 +++++++++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/.ci_support/README b/.ci_support/README index 69c5db6..a47316b 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1,6 +1,6 @@ -This file is automatically generated by conda-smithy. If any -particular build configuration is expected, but it is not found, -please make sure all dependencies are satisfiable. To add/modify any -matrix elements, you should create/change conda-smithy's input -recipe/conda_build_config.yaml and re-render the recipe, rather than -editing these files directly. +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/README.md b/README.md index e009f24..2dc8155 100644 --- a/README.md +++ b/README.md @@ -95,18 +95,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `lld` can be installed with: +Once the `conda-forge` channel has been enabled, `lld` can be installed with `conda`: ``` conda install lld ``` -It is possible to list all of the versions of `lld` available on your platform with: +or with `mamba`: + +``` +mamba install lld +``` + +It is possible to list all of the versions of `lld` available on your platform with `conda`: ``` conda search lld --channel conda-forge ``` +or with `mamba`: + +``` +mamba search lld --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search lld --channel conda-forge + +# List packages depending on `lld`: +mamba repoquery whoneeds lld --channel conda-forge + +# List dependencies of `lld`: +mamba repoquery depends lld --channel conda-forge +``` + About conda-forge ================= @@ -122,10 +147,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -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/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[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/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. From b44c883b43f8d75f21df1256134fb7eef7c8667b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 28 Apr 2022 16:51:28 +1100 Subject: [PATCH 09/29] retrigger CI From d078569eacd8f51c9f768a21d3d3c59d914ff85c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 28 Apr 2022 07:20:10 +0000 Subject: [PATCH 10/29] updated v14.0.2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2117733..e20ae3c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.0" %} +{% set version = "14.0.2" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 35ce9edbc8f774fe07c8f4acdf89ec8ac695c8016c165dd86b8d10e7cba07e23 + sha256: dd559ea1b02cb241def100e05b1e406521da50af87aca0f2ae309abd916177d5 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 2e959608511705c9018f14ae52771f574fc523c0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 28 Apr 2022 19:43:39 +1100 Subject: [PATCH 11/29] correct license --- README.md | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2dc8155..3791faf 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ About lld Home: https://lld.llvm.org/ -Package license: NCSA +Package license: Apache-2.0 WITH LLVM-exception Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/lld-feedstock/blob/main/LICENSE.txt) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e20ae3c..4a6ad96 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,7 +37,7 @@ test: about: home: https://lld.llvm.org/ - license: NCSA + license: Apache-2.0 WITH LLVM-exception license_file: lld/LICENSE.TXT summary: The LLVM Linker dev_url: https://github.com/llvm/llvm-project/ From 13514cdf41632a442d8eab4a14c4977ce17aef15 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 29 Apr 2022 12:07:42 +0000 Subject: [PATCH 12/29] updated v14.0.3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4a6ad96..795c0b5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.2" %} +{% set version = "14.0.3" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: dd559ea1b02cb241def100e05b1e406521da50af87aca0f2ae309abd916177d5 + sha256: 44d3e7a784d5cf805e72853bb03f218bd1058d448c03ca883dabbebc99204e0c patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 199376696267967d663f35a10158ecc037b1c2a8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 25 May 2022 12:13:10 +0000 Subject: [PATCH 13/29] updated v14.0.4 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 795c0b5..3914aeb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.3" %} +{% set version = "14.0.4" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 44d3e7a784d5cf805e72853bb03f218bd1058d448c03ca883dabbebc99204e0c + sha256: f40c77ceff02ae3873d273a51b0f93cd8e6409576f771d860d75835335522052 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From ddf57588f816fd7c8cf70a2814a4e25438e77db6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 25 Jun 2022 07:05:46 +0000 Subject: [PATCH 14/29] updated v14.0.6 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3914aeb..f588104 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.4" %} +{% set version = "14.0.6" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: f40c77ceff02ae3873d273a51b0f93cd8e6409576f771d860d75835335522052 + sha256: 8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 6d95ff5106b8152ca0328f5ec71ca5a8bda91fe3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 25 Jun 2022 07:06:04 +0000 Subject: [PATCH 15/29] MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.0, and conda-forge-pinning 2022.06.24.18.35.54 --- .azure-pipelines/azure-pipelines-win.yml | 69 ++++++++---------------- .circleci/config.yml | 3 +- .scripts/build_steps.sh | 9 +++- .scripts/run_osx_build.sh | 4 ++ LICENSE.txt | 30 ++++++++--- build-locally.py | 19 ++++--- 6 files changed, 70 insertions(+), 64 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 88fd9c1..8a0bcae 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -16,45 +16,27 @@ jobs: CONDA_BLD_PATH: D:\\bld\\ steps: - - script: | - choco install vcpython27 -fdv -y --debug - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Install vcpython27.msi (if needed) - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - # - script: rmdir C:\cygwin /s /q - # continueOnError: true - - - powershell: | - Set-PSDebug -Trace 1 - - $batchcontent = @" - ECHO ON - SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 - - DIR "%vcpython%" - - CALL "%vcpython%\vcvarsall.bat" %* - "@ - - $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" - $batchPath = "$batchDir" + "\vcvarsall.bat" - New-Item -Path $batchPath -ItemType "file" -Force - - Set-Content -Value $batchcontent -Path $batchPath + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) - Get-ChildItem -Path $batchDir + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge - Get-ChildItem -Path ($batchDir + '\..') + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) - - task: CondaEnvironment@1 - inputs: - packageSpecs: 'python=3.9 conda-build conda pip boa conda-forge-ci-setup=3' # Optional - installOptions: "-c conda-forge" - updateConda: true - displayName: Install conda-build and activate environment + - script: | + call activate base + mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 displayName: Set PYTHONUNBUFFERED @@ -71,25 +53,16 @@ jobs: call activate base run_conda_forge_build_setup displayName: conda-forge build setup - - - # Special cased version setting some more things! - - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml - displayName: Build recipe (vs2008) - env: - VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" - PYTHONUNBUFFERED: 1 - condition: contains(variables['CONFIG'], 'vs2008') - script: | call activate base + if EXIST LICENSE.txt ( + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" + ) conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 - condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..3e61aa2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,8 @@ version: 2 jobs: build: working_directory: ~/test - machine: true + machine: + image: ubuntu-2004:current steps: - run: # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index c6b23e8..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -24,7 +24,10 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < /dev/null +if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then + cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" +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}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3d85505..736a39a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -61,6 +61,10 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then fi +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +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}" diff --git a/LICENSE.txt b/LICENSE.txt index 6ec1401..2ec51d7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license +BSD-3-Clause license Copyright (c) 2015-2022, conda-forge contributors All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/build-locally.py b/build-locally.py index eec38a0..3f4b7a7 100755 --- a/build-locally.py +++ b/build-locally.py @@ -86,12 +86,19 @@ def main(args=None): verify_config(ns) setup_environment(ns) - if ns.config.startswith("linux") or ( - ns.config.startswith("osx") and platform.system() == "Linux" - ): - run_docker_build(ns) - elif ns.config.startswith("osx"): - run_osx_build(ns) + try: + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) + finally: + recipe_license_file = os.path.join( + "recipe", "recipe-scripts-license.txt" + ) + if os.path.exists(recipe_license_file): + os.remove(recipe_license_file) if __name__ == "__main__": From 0792a074640677cabb6f04f565f4b36b6a6371db Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:17:54 +0000 Subject: [PATCH 16/29] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomergeUpdate --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 773b3d1..da1368a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -10,7 +10,7 @@ jobs: name: automerge steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main From c4e62297ef164e3aa624f419f116ee9297898753 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 05:44:41 +0000 Subject: [PATCH 17/29] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.3, and conda-forge-pinning 2022.11.08.23.18.36 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_.yaml | 3 --- .ci_support/linux_aarch64_.yaml | 3 --- .ci_support/linux_ppc64le_.yaml | 3 --- .ci_support/osx_64_.yaml | 3 --- .ci_support/osx_arm64_.yaml | 3 --- .ci_support/win_64_.yaml | 7 +------ .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 5 ++--- README.md | 12 ++++++------ 12 files changed, 14 insertions(+), 35 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 84d4f42..8032e96 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: osx_64_: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a0bcae..13e526a 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -35,7 +35,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 3c525fb..250d734 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -14,9 +14,6 @@ cxx_compiler_version: - '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - zlib: - max_pin: x.x target_platform: - linux-64 vc: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 99214b6..15693a8 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -18,9 +18,6 @@ cxx_compiler_version: - '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 -pin_run_as_build: - zlib: - max_pin: x.x target_platform: - linux-aarch64 vc: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 1cc02a8..d6266a6 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -14,9 +14,6 @@ cxx_compiler_version: - '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - zlib: - max_pin: x.x target_platform: - linux-ppc64le vc: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 9a2f26b..f17b6c9 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -14,9 +14,6 @@ cxx_compiler_version: - '*' macos_machine: - x86_64-apple-darwin13.4.0 -pin_run_as_build: - zlib: - max_pin: x.x target_platform: - osx-64 vc: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index f501f6f..2ba1a97 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -14,9 +14,6 @@ cxx_compiler_version: - '*' macos_machine: - arm64-apple-darwin20.0.0 -pin_run_as_build: - zlib: - max_pin: x.x target_platform: - osx-arm64 vc: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index fdbb760..9b386af 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,12 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libxml2: -- '2.9' -pin_run_as_build: - libxml2: - max_pin: x.x - zlib: - max_pin: x.x +- '2.10' target_platform: - win-64 vc: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..84431a6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a..b3abaeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index 3791faf..55decc7 100644 --- a/README.md +++ b/README.md @@ -32,42 +32,42 @@ Current build status From 623459171ea1b4fe019fc50b6845d084b7cb2454 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 8 Nov 2022 23:48:16 +0000 Subject: [PATCH 18/29] updated v15.0.4 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f588104..dabe8a2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.6" %} +{% set version = "15.0.4" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a + sha256: a3112dca9bdea4095361829910b74fb6b9da8ae6e3500db67c43c540ad6072da patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From b3b439b39783ef549ec061f04da0626f79db7a3f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 16 Nov 2022 21:53:40 +0000 Subject: [PATCH 19/29] updated v15.0.5 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dabe8a2..3bbdc61 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "15.0.4" %} +{% set version = "15.0.5" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: a3112dca9bdea4095361829910b74fb6b9da8ae6e3500db67c43c540ad6072da + sha256: 9c4278a6b8884eb7f4ae7dfe3c8e5445019824885e47cfdf1392563c47316fd6 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 7d493716cf4034b662fa45d1c968815341a69aec Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 23:10:48 +0000 Subject: [PATCH 20/29] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration DotConda --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 836526b..51c3956 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -6,3 +6,5 @@ test_on_native_only: true github: branch_name: main tooling_branch_name: main +conda_build: + pkg_format: '2' From e36f8740e796dca80858d15c5d4d1361c7744ca5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 29 Nov 2022 21:02:59 +0000 Subject: [PATCH 21/29] updated v15.0.6 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3bbdc61..e664a13 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "15.0.5" %} +{% set version = "15.0.6" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 9c4278a6b8884eb7f4ae7dfe3c8e5445019824885e47cfdf1392563c47316fd6 + sha256: 9d53ad04dc60cb7b30e810faf64c5ab8157dadef46c8766f67f286238256ff92 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From cbb3351d65279a2471d017a87d4e205f84f10aa2 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 12 Jan 2023 11:49:40 +0000 Subject: [PATCH 22/29] updated v15.0.7 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e664a13..7b0d595 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "15.0.6" %} +{% set version = "15.0.7" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 9d53ad04dc60cb7b30e810faf64c5ab8157dadef46c8766f67f286238256ff92 + sha256: 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 787b4c3b74d82721ddfe33fcdee72f8a9b106a79 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 12 Jan 2023 11:49:54 +0000 Subject: [PATCH 23/29] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.01.12.11.18.58 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++++ .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 13e526a..a192c0b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -72,6 +73,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 250d734..7c21fdc 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 15693a8..1a6494b 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 target_platform: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index d6266a6..6028b11 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le target_platform: From 3868d1b7129f237a0e1f301e2fdfb0608eeca396 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 1 Feb 2023 22:31:47 +1100 Subject: [PATCH 24/29] Revert "remove rc channel sources & targets" This reverts commit 30b3945c6d7338bc9d50d506258c3d0b56afc510. --- recipe/conda_build_config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index a253f42..23a59c8 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -12,3 +12,9 @@ c_compiler_version: # [osx] - "*" # [osx] cxx_compiler_version: # [osx] - "*" # [osx] + +channel_targets: + - conda-forge llvm_rc + +channel_sources: + - conda-forge/label/llvm_rc,conda-forge From 5cbd062b8a385893660b9f1fca1688c80f1f468b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 1 Feb 2023 22:35:20 +1100 Subject: [PATCH 25/29] remove obsolete compiler pins --- recipe/conda_build_config.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 23a59c8..3468563 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,13 +1,10 @@ -c_compiler: +c_compiler: # [unix] - clang_bootstrap # [osx] - gcc # [linux] - - vs2019 # [win] -cxx_compiler: +cxx_compiler: # [unix] - clang_bootstrap # [osx] - gxx # [linux] - - vs2019 # [win] -vc: - - 14 + c_compiler_version: # [osx] - "*" # [osx] cxx_compiler_version: # [osx] From 4799538b5e38d8d86ce8d8772ce27a27685bfdd4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 1 Feb 2023 22:36:35 +1100 Subject: [PATCH 26/29] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.01.31.03.10.11 --- .ci_support/linux_64_.yaml | 6 ++---- .ci_support/linux_aarch64_.yaml | 6 ++---- .ci_support/linux_ppc64le_.yaml | 6 ++---- .ci_support/osx_64_.yaml | 6 ++---- .ci_support/osx_arm64_.yaml | 6 ++---- .ci_support/win_64_.yaml | 4 ++-- 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 7c21fdc..6791666 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,9 +5,9 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: @@ -16,8 +16,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: - linux-64 -vc: -- '14' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 1a6494b..055512c 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -9,9 +9,9 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: @@ -20,8 +20,6 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 target_platform: - linux-aarch64 -vc: -- '14' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 6028b11..0139e5f 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,9 +5,9 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: @@ -16,8 +16,6 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le target_platform: - linux-ppc64le -vc: -- '14' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index f17b6c9..c1e1ed7 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,9 +5,9 @@ c_compiler: c_compiler_version: - '*' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: @@ -16,8 +16,6 @@ macos_machine: - x86_64-apple-darwin13.4.0 target_platform: - osx-64 -vc: -- '14' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 2ba1a97..f207b62 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,9 +5,9 @@ c_compiler: c_compiler_version: - '*' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: @@ -16,8 +16,6 @@ macos_machine: - arm64-apple-darwin20.0.0 target_platform: - osx-arm64 -vc: -- '14' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 9b386af..48fcb8b 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,9 +1,9 @@ c_compiler: - vs2019 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - vs2019 libxml2: From 644cbabff3012c51f25b0de0fb3972a4b7593339 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 1 Feb 2023 22:37:31 +1100 Subject: [PATCH 27/29] bump to 16.0.0.rc1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7b0d595..548be91 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "15.0.7" %} +{% set version = "16.0.0.rc1" %} package: name: lld @@ -6,7 +6,7 @@ package: source: url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6 + sha256: 8399db003b223ce33e3d7a5ee9df8dc3574cedffa5d9be4783660643f8402900 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 8d1c92ed78d4664234f60f92302e6b687d396eac Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 1 Feb 2023 22:37:42 +1100 Subject: [PATCH 28/29] remove obsolete skip --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 548be91..b3b5245 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,6 @@ source: build: number: 0 - skip: true # [win and vc<14] requirements: build: From 1ae10a066081a3854b31a980376d7f7da380ee7e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 1 Feb 2023 22:38:15 +1100 Subject: [PATCH 29/29] rebase patch --- ...int-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch b/recipe/patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch index 02a3eab..46d729f 100644 --- a/recipe/patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch +++ b/recipe/patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch @@ -1,4 +1,4 @@ -From e5e986303e9b7d19483c1e1b3493122958dbeeee Mon Sep 17 00:00:00 2001 +From 14d6c677c1758066f1ef10635439754cc3161057 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 14 Jul 2021 21:53:53 +0200 Subject: [PATCH] point header inclusion in lld/MachO/CMakeLists.txt to SRC_DIR @@ -8,7 +8,7 @@ Subject: [PATCH] point header inclusion in lld/MachO/CMakeLists.txt to SRC_DIR 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lld/MachO/CMakeLists.txt b/lld/MachO/CMakeLists.txt -index 4bd0816bca66..de31c47d38a8 100644 +index ea26889267..3e06eb78fc 100644 --- a/lld/MachO/CMakeLists.txt +++ b/lld/MachO/CMakeLists.txt @@ -2,7 +2,7 @@ set(LLVM_TARGET_DEFINITIONS Options.td) @@ -21,5 +21,5 @@ index 4bd0816bca66..de31c47d38a8 100644 add_lld_library(lldMachO Arch/ARM.cpp -- -2.32.0.windows.2 +2.38.1.windows.1
linux_64 - - variant + + variant
linux_aarch64 - - variant + + variant
linux_ppc64le - - variant + + variant
osx_64 - - variant + + variant
osx_arm64 - - variant + + variant
win_64 - - variant + + variant
linux_64 - variant + variant
linux_aarch64 - variant + variant
linux_ppc64le - variant + variant
osx_64 - variant + variant
osx_arm64 - variant + variant
win_64 - variant + variant