From c56abc48552690b6659143d38b3d196a13242aa4 Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Sun, 12 May 2024 17:14:44 +0000 Subject: [PATCH 01/13] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomergeUpdate --- .github/workflows/automerge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index da1368a..0535f6a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest name: automerge steps: - - name: checkout - uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main From 5ebc7ba017b7a56540cbfce82bc5e18eb285026b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 25 Jul 2024 21:13:37 +1100 Subject: [PATCH 02/13] Revert "remove rc-channels" This reverts commit db6eb1cb70c7c8506a5c7cc29d03a8f049a20675. --- recipe/conda_build_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 3894159..b9f42bd 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,3 +4,8 @@ c_compiler: # [osx] - clang_bootstrap # [osx] cxx_compiler: # [osx] - clang_bootstrap # [osx] + +channel_sources: + - conda-forge/label/llvm_rc,conda-forge +channel_targets: + - conda-forge llvm_rc From c69b09461175cda13486dc98699390333af3b6f9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 25 Jul 2024 21:14:13 +1100 Subject: [PATCH 03/13] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.25.08.49.31 --- .ci_support/linux_64_.yaml | 8 ++++---- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- .scripts/build_steps.sh | 1 - README.md | 16 ++++++++-------- 8 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 60effb7..1d33071 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,13 +1,13 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- 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: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index fc85b91..864648e 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: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 986e424..97b65be 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,9 +5,9 @@ c_stdlib_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: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 32d1c14..db2734f 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '10.13' 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: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 6228801..bf68aad 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '11.0' 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: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 84637ec..2a2216c 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,9 +1,9 @@ c_stdlib: - vs channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - vs2019 libxml2: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 97dc8d9..6c805a9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -69,7 +69,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 diff --git a/README.md b/README.md index 4d17aab..59d8a15 100644 --- a/README.md +++ b/README.md @@ -98,14 +98,14 @@ Current release info Installing compiler-rt ====================== -Installing `compiler-rt` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `compiler-rt` from the `conda-forge/label/llvm_rc` channel can be achieved by adding `conda-forge/label/llvm_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/llvm_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `compiler-rt, compiler-rt_linux-64` can be installed with `conda`: +Once the `conda-forge/label/llvm_rc` channel has been enabled, `compiler-rt, compiler-rt_linux-64` can be installed with `conda`: ``` conda install compiler-rt compiler-rt_linux-64 @@ -120,26 +120,26 @@ mamba install compiler-rt compiler-rt_linux-64 It is possible to list all of the versions of `compiler-rt` available on your platform with `conda`: ``` -conda search compiler-rt --channel conda-forge +conda search compiler-rt --channel conda-forge/label/llvm_rc ``` or with `mamba`: ``` -mamba search compiler-rt --channel conda-forge +mamba search compiler-rt --channel conda-forge/label/llvm_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search compiler-rt --channel conda-forge +mamba repoquery search compiler-rt --channel conda-forge/label/llvm_rc # List packages depending on `compiler-rt`: -mamba repoquery whoneeds compiler-rt --channel conda-forge +mamba repoquery whoneeds compiler-rt --channel conda-forge/label/llvm_rc # List dependencies of `compiler-rt`: -mamba repoquery depends compiler-rt --channel conda-forge +mamba repoquery depends compiler-rt --channel conda-forge/label/llvm_rc ``` From 77757d6f7e2df2ca220aaf3c085e79aac5a91312 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 28 Jul 2024 09:13:01 +1100 Subject: [PATCH 04/13] compiler-rt v19.1.0.rc1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 604ca9e..67d1fdf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "18.1.8" %} +{% set version = "19.1.0.rc1" %} {% set major_ver = version.split('.')[0] %} package: @@ -7,7 +7,7 @@ package: source: url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 09c08693a9afd6236f27a2ebae62cda656eba19021ef3f94d59e931d662d4856 + sha256: cd3b42caf8e78c497712a661303672c1a6279eb1a5ff8735488087319ab95214 patches: - patches/0001-no-code-sign.patch From febb0e547cfd52f87e4cc3c2929fb5945c9bc4f6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 28 Jul 2024 09:18:50 +1100 Subject: [PATCH 05/13] rebase patch --- recipe/patches/0001-no-code-sign.patch | 59 ++++++++++++++------------ 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/recipe/patches/0001-no-code-sign.patch b/recipe/patches/0001-no-code-sign.patch index 1f3706a..09d9724 100644 --- a/recipe/patches/0001-no-code-sign.patch +++ b/recipe/patches/0001-no-code-sign.patch @@ -1,47 +1,50 @@ -From bf3c5b20918704c6f07f5aecef840376fd3b0806 Mon Sep 17 00:00:00 2001 +From 3a686bf47180a54862a935069849015303af2329 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 22 Apr 2019 02:00:30 -0500 Subject: [PATCH] no code sign --- - compiler-rt/cmake/Modules/AddCompilerRT.cmake | 28 ------------------- - 1 file changed, 28 deletions(-) + compiler-rt/cmake/Modules/AddCompilerRT.cmake | 31 ------------------- + 1 file changed, 31 deletions(-) diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake -index e0400a8ea952..ee51eb5bc514 100644 +index 6962b733733a..9afc70e072ab 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake -@@ -392,34 +392,6 @@ function(add_compiler_rt_runtime name type) +@@ -388,37 +388,6 @@ function(add_compiler_rt_runtime name type) set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") endif() - if (APPLE AND NOT CMAKE_LINKER MATCHES ".*lld.*") -- # Ad-hoc sign the dylibs when using Xcode versions older than 12. -- # Xcode 12 shipped with ld64-609. -- # FIXME: Remove whole conditional block once everything uses Xcode 12+. -- set(LD_V_OUTPUT) +- # Apple's linker signs the resulting dylib with an ad-hoc code signature in +- # most situations, except: +- # 1. Versions of ld64 prior to ld64-609 in Xcode 12 predate this behavior. +- # 2. Apple's new linker does not when building with `-darwin-target-variant` +- # to support macOS Catalyst. +- # +- # Explicitly re-signing the dylib works around both of these issues. The +- # signature is marked as `linker-signed` when that is supported so that it +- # behaves as expected when processed by subsequent tooling. +- # +- # Detect whether `codesign` supports `-o linker-signed` by passing it as an +- # argument and looking for `invalid argument "linker-signed"` in its output. +- # FIXME: Remove this once all supported toolchains support `-o linker-signed`. - execute_process( -- COMMAND sh -c "${CMAKE_LINKER} -v 2>&1 | head -1" -- RESULT_VARIABLE HAD_ERROR -- OUTPUT_VARIABLE LD_V_OUTPUT +- COMMAND sh -c "codesign -f -s - -o linker-signed this-does-not-exist 2>&1 | grep -q linker-signed" +- RESULT_VARIABLE CODESIGN_SUPPORTS_LINKER_SIGNED - ) -- if (HAD_ERROR) -- message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}") -- endif() -- set(NEED_EXPLICIT_ADHOC_CODESIGN 1) -- if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*") -- string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) -- if (HOST_LINK_VERSION VERSION_GREATER_EQUAL 609) -- set(NEED_EXPLICIT_ADHOC_CODESIGN 0) -- endif() -- endif() -- if (NEED_EXPLICIT_ADHOC_CODESIGN) -- add_custom_command(TARGET ${libname} -- POST_BUILD -- COMMAND codesign --sign - $ -- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR} -- ) +- +- set(EXTRA_CODESIGN_ARGUMENTS) +- if (CODESIGN_SUPPORTS_LINKER_SIGNED) +- list(APPEND EXTRA_CODESIGN_ARGUMENTS -o linker-signed) - endif() +- +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - ${EXTRA_CODESIGN_ARGUMENTS} $ +- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR} +- COMMAND_EXPAND_LISTS +- ) - endif() endif() From a334e16e9266326047ab08bdb3c4a189080933fb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 3 Aug 2024 21:47:17 +1100 Subject: [PATCH 06/13] lighten run-dependencies; clangxx not obligatory --- recipe/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 67d1fdf..9fc40a3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - patches/0001-no-code-sign.patch build: - number: 0 + number: 1 requirements: build: @@ -44,8 +44,8 @@ outputs: host: run: - clang {{ version }} - - clangxx {{ version }} run_constrained: + - clangxx {{ version }} - compiler-rt {{ version }} files: - lib/clang/{{ major_ver }}/lib # [unix] @@ -65,7 +65,6 @@ outputs: host: run: - clang {{ version }} - - clangxx {{ version }} - compiler-rt_{{ target_platform }} {{ version }} files: - lib/clang/{{ major_ver }}/share # [unix] From 7cad352ddafd0560615733355749bfaeafc26469 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 6 Aug 2024 09:03:46 +1100 Subject: [PATCH 07/13] compiler-rt v19.1.0.rc2 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9fc40a3..c0649bc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "19.1.0.rc1" %} +{% set version = "19.1.0.rc2" %} {% set major_ver = version.split('.')[0] %} package: @@ -7,12 +7,12 @@ package: source: url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: cd3b42caf8e78c497712a661303672c1a6279eb1a5ff8735488087319ab95214 + sha256: 5332e77a658136c778fc32ec2a3687de4d63e0ff48010be205c4e7af6e76f1f1 patches: - patches/0001-no-code-sign.patch build: - number: 1 + number: 0 requirements: build: From 46ef8df8bd95857b81d05d5af5fb481866fa3847 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 21 Aug 2024 16:31:27 +1100 Subject: [PATCH 08/13] compiler-rt v19.1.0.rc3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c0649bc..16dd9cb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "19.1.0.rc2" %} +{% set version = "19.1.0.rc3" %} {% set major_ver = version.split('.')[0] %} package: @@ -7,7 +7,7 @@ package: source: url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 5332e77a658136c778fc32ec2a3687de4d63e0ff48010be205c4e7af6e76f1f1 + sha256: 57f926edf60a92947fa9b8b0adfdf3c6f2182a4ecf1c929176218eef619d7411 patches: - patches/0001-no-code-sign.patch From 57c06767d231023ded92571f02fc56c8d4c8082e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 21 Aug 2024 16:32:03 +1100 Subject: [PATCH 09/13] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.38.0, and conda-forge-pinning 2024.08.20.23.21.46 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .scripts/run_osx_build.sh | 2 +- build-locally.py | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d609fcd..204327b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -24,7 +24,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 1d33071..4a3e41f 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 864648e..315af2d 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 97b65be..14ad5eb 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index db2734f..ccdfdaf 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' libxml2: - '2' macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index bf68aad..72ea7a5 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' libxml2: - '2' macos_machine: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 0c9e992..4ebc38f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From 871e4bd37e6e753f55e4d8ccaf566bb27be6d478 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 4 Sep 2024 15:04:47 +1100 Subject: [PATCH 10/13] compiler-rt v19.1.0.rc4 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8daaf20..174111a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "19.1.0.rc3" %} +{% set version = "19.1.0.rc4" %} {% set major_ver = version.split('.')[0] %} package: @@ -7,13 +7,13 @@ package: source: url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 57f926edf60a92947fa9b8b0adfdf3c6f2182a4ecf1c929176218eef619d7411 + sha256: 570ea538eae9939e1b008c4e8055227dae3ab58054c74707ad1d5a8cb51536c3 patches: - patches/0001-no-code-sign.patch - patches/0002-Revert-Declare-_availability_version_check-as-weak_i.patch build: - number: 1 + number: 0 requirements: build: From eb632040ebbeaf21e50f717f36fe3e718e24343a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 17 Sep 2024 17:37:10 +0000 Subject: [PATCH 11/13] updated v19.1.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 174111a..9c82711 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "19.1.0.rc4" %} +{% set version = "19.1.0" %} {% set major_ver = version.split('.')[0] %} package: @@ -7,7 +7,7 @@ package: source: url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 570ea538eae9939e1b008c4e8055227dae3ab58054c74707ad1d5a8cb51536c3 + sha256: 0a08341036ca99a106786f50f9c5cb3fbe458b3b74cab6089fd368d0edb2edfe patches: - patches/0001-no-code-sign.patch - patches/0002-Revert-Declare-_availability_version_check-as-weak_i.patch From ab2938f2db87b7dac94a7109319032f08395e12b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 17 Sep 2024 22:00:04 +0200 Subject: [PATCH 12/13] remove rc-channels --- recipe/conda_build_config.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b9f42bd..3894159 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,8 +4,3 @@ c_compiler: # [osx] - clang_bootstrap # [osx] cxx_compiler: # [osx] - clang_bootstrap # [osx] - -channel_sources: - - conda-forge/label/llvm_rc,conda-forge -channel_targets: - - conda-forge llvm_rc From 79ff1b5148d76e6e34462f4743510c3d44161e7e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 17 Sep 2024 22:01:24 +0200 Subject: [PATCH 13/13] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.17.19.41.55 --- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- README.md | 16 ++++++++-------- build-locally.py | 5 ++++- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 4a3e41f..0c43522 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,9 +5,9 @@ c_stdlib_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: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 315af2d..bd5fb6f 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/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 14ad5eb..adaddbd 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,9 +5,9 @@ c_stdlib_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: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index ccdfdaf..12a4bda 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '10.13' 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 72ea7a5..78de52d 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,9 +7,9 @@ c_stdlib: c_stdlib_version: - '11.0' 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 2a2216c..84637ec 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,9 +1,9 @@ c_stdlib: - vs channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - vs2019 libxml2: diff --git a/README.md b/README.md index 59d8a15..4d17aab 100644 --- a/README.md +++ b/README.md @@ -98,14 +98,14 @@ Current release info Installing compiler-rt ====================== -Installing `compiler-rt` from the `conda-forge/label/llvm_rc` channel can be achieved by adding `conda-forge/label/llvm_rc` to your channels with: +Installing `compiler-rt` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` -conda config --add channels conda-forge/label/llvm_rc +conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge/label/llvm_rc` channel has been enabled, `compiler-rt, compiler-rt_linux-64` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `compiler-rt, compiler-rt_linux-64` can be installed with `conda`: ``` conda install compiler-rt compiler-rt_linux-64 @@ -120,26 +120,26 @@ mamba install compiler-rt compiler-rt_linux-64 It is possible to list all of the versions of `compiler-rt` available on your platform with `conda`: ``` -conda search compiler-rt --channel conda-forge/label/llvm_rc +conda search compiler-rt --channel conda-forge ``` or with `mamba`: ``` -mamba search compiler-rt --channel conda-forge/label/llvm_rc +mamba search compiler-rt --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search compiler-rt --channel conda-forge/label/llvm_rc +mamba repoquery search compiler-rt --channel conda-forge # List packages depending on `compiler-rt`: -mamba repoquery whoneeds compiler-rt --channel conda-forge/label/llvm_rc +mamba repoquery whoneeds compiler-rt --channel conda-forge # List dependencies of `compiler-rt`: -mamba repoquery depends compiler-rt --channel conda-forge/label/llvm_rc +mamba repoquery depends compiler-rt --channel conda-forge ``` diff --git a/build-locally.py b/build-locally.py index d78427b..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform