From 75cc049c761fd2d4c0ebdbfe1931330f526486ee Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 1 Feb 2024 13:33:42 +0100 Subject: [PATCH 1/3] add rc-channel sources & targets --- recipe/conda_build_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..b2aedab --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,5 @@ +channel_targets: + - conda-forge llvm_rc + +channel_sources: + - conda-forge/label/llvm_rc,conda-forge From 129c0af41b27c2d8ed6c02a250e824e3a77018c3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 1 Feb 2024 13:33:51 +0100 Subject: [PATCH 2/3] flang 18.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 5c7a5d1..2608c04 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.6" %} +{% set version = "18.1.0.rc1" %} package: name: flang-split @@ -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: 58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813 + sha256: eb1a2751408e4cbb08b152285b23dea00e4a1bc2cd28c0df90fe1ce699671154 build: number: 0 From 7e79bdb5697dcd112ebb197f0d6d088a10b328de Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 1 Feb 2024 13:35:28 +0100 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.01.06.13.37 --- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- .gitignore | 25 +++++++++++++++++++++++-- .scripts/build_steps.sh | 6 ------ .scripts/run_docker_build.sh | 6 ++++++ README.md | 16 ++++++++-------- 6 files changed, 41 insertions(+), 20 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 334e550..e0b4086 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: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index c09f40f..eb1ff89 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 target_platform: diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 5382195..f017291 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -54,12 +54,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef01..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/README.md b/README.md index e925350..c325f9e 100644 --- a/README.md +++ b/README.md @@ -64,14 +64,14 @@ Current release info Installing flang ================ -Installing `flang` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `flang` 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, `flang, flang_linux-64, flang_win-64, libflang, libfortran-main` can be installed with `conda`: +Once the `conda-forge/label/llvm_rc` channel has been enabled, `flang, flang_linux-64, flang_win-64, libflang, libfortran-main` can be installed with `conda`: ``` conda install flang flang_linux-64 flang_win-64 libflang libfortran-main @@ -86,26 +86,26 @@ mamba install flang flang_linux-64 flang_win-64 libflang libfortran-main It is possible to list all of the versions of `flang` available on your platform with `conda`: ``` -conda search flang --channel conda-forge +conda search flang --channel conda-forge/label/llvm_rc ``` or with `mamba`: ``` -mamba search flang --channel conda-forge +mamba search flang --channel conda-forge/label/llvm_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search flang --channel conda-forge +mamba repoquery search flang --channel conda-forge/label/llvm_rc # List packages depending on `flang`: -mamba repoquery whoneeds flang --channel conda-forge +mamba repoquery whoneeds flang --channel conda-forge/label/llvm_rc # List dependencies of `flang`: -mamba repoquery depends flang --channel conda-forge +mamba repoquery depends flang --channel conda-forge/label/llvm_rc ```