From 8ef56a189abf16450a3c49b1af8aeba25c835645 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 11 Mar 2023 20:54:07 +1100 Subject: [PATCH 1/5] bump to 16.0.0.rc4 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d42d313e..b91019a5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.0.rc3" %} +{% set version = "16.0.0.rc4" %} {% set major_ver = version.split(".")[0] %} package: @@ -7,7 +7,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: 8fa9792a1a04f78d023b87c5e5bd25010d5f73a5c0ae1830e897d85821ee9325 + sha256: 36e723b0befd0874a799253f5cfac8b00fe5bbfec3020ccf7b4fdae566a7e089 patches: # - patches/intel-D47188-svml-VF.patch # Fixes vectorizer and extends SVML support # - patches/expect-fastmath-entrypoints-in-add-TLI-mappings.ll.patch # adjusts test added in 10.0.0 for intel-D47188-svml-VF.patch effects @@ -16,7 +16,7 @@ source: - patches/0002-Always-copy-on-windows.patch build: - number: 1 + number: 0 merge_build_host: false requirements: From a043d4a73acf1ad7a05001fce02c054c3339e8cb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 Mar 2023 10:41:57 +1100 Subject: [PATCH 2/5] make ninja verbose --- recipe/install_llvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/install_llvm.sh b/recipe/install_llvm.sh index 3f6c2845..8575dcb5 100644 --- a/recipe/install_llvm.sh +++ b/recipe/install_llvm.sh @@ -2,7 +2,7 @@ set -x cd build -ninja install +ninja --verbose install IFS='.' read -ra VER_ARR <<< "$PKG_VERSION" From 0173ed76579fcbbd87e8fc18073ccac69c93053f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 13 Mar 2023 19:55:44 -0500 Subject: [PATCH 3/5] Keep build environments consistent to avoid rebuilds --- recipe/meta.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b91019a5..6f7d100b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,7 +47,9 @@ outputs: - cmake - ninja - python >=3 + - libcxx {{ cxx_compiler_version }} # [osx] host: + - libcxx {{ cxx_compiler_version }} # [osx] - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} - {{ pin_subpackage("llvm-tools", exact=True) }} - libxml2 @@ -83,8 +85,9 @@ outputs: - ninja # [not win] - cmake # [not win] - python >=3 # [not win] + - libcxx {{ cxx_compiler_version }} # [osx] host: - - libcxx >={{ cxx_compiler_version }} # [osx] + - libcxx {{ cxx_compiler_version }} # [osx] - libxml2 - zlib - zstd # [build_platform == target_platform] @@ -127,7 +130,9 @@ outputs: - cmake - ninja - python >=3 + - libcxx {{ cxx_compiler_version }} # [osx] host: + - libcxx {{ cxx_compiler_version }} # [osx] - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} - libxml2 - zlib From 48c164caa1e2bbae83cfcdc6712149496713d82c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 Mar 2023 08:32:24 +1100 Subject: [PATCH 4/5] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and conda-forge-pinning 2023.03.14.16.49.28 --- .azure-pipelines/azure-pipelines-win.yml | 4 +-- .scripts/build_steps.sh | 4 +-- .scripts/run_osx_build.sh | 4 +-- README.md | 32 ++++++++++++------------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b8..8a96a72e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - script: | call activate base - 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 + mamba.exe install "python=3.10" 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 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a63..a6b09f6b 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 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # 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 b3abaeb5..bb00584b 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 2c1d8cda..38b59295 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About llvm-package -================== +About llvm-package-feedstock +============================ + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/llvmdev-feedstock/blob/main/LICENSE.txt) Home: http://llvm.org/ Package license: Apache-2.0 WITH LLVM-exception -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/llvmdev-feedstock/blob/main/LICENSE.txt) - Summary: Development headers and libraries for LLVM Development: https://github.com/llvm/llvm-project @@ -83,7 +83,7 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libllvm15-green.svg)](https://anaconda.org/conda-forge/libllvm15) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libllvm15.svg)](https://anaconda.org/conda-forge/libllvm15) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libllvm15.svg)](https://anaconda.org/conda-forge/libllvm15) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libllvm15.svg)](https://anaconda.org/conda-forge/libllvm15) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libllvm16-green.svg)](https://anaconda.org/conda-forge/libllvm16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libllvm16.svg)](https://anaconda.org/conda-forge/libllvm16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libllvm16.svg)](https://anaconda.org/conda-forge/libllvm16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libllvm16.svg)](https://anaconda.org/conda-forge/libllvm16) | | [![Conda Recipe](https://img.shields.io/badge/recipe-lit-green.svg)](https://anaconda.org/conda-forge/lit) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/lit.svg)](https://anaconda.org/conda-forge/lit) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/lit.svg)](https://anaconda.org/conda-forge/lit) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/lit.svg)](https://anaconda.org/conda-forge/lit) | | [![Conda Recipe](https://img.shields.io/badge/recipe-llvm-green.svg)](https://anaconda.org/conda-forge/llvm) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/llvm.svg)](https://anaconda.org/conda-forge/llvm) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/llvm.svg)](https://anaconda.org/conda-forge/llvm) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/llvm.svg)](https://anaconda.org/conda-forge/llvm) | | [![Conda Recipe](https://img.shields.io/badge/recipe-llvm--tools-green.svg)](https://anaconda.org/conda-forge/llvm-tools) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/llvm-tools.svg)](https://anaconda.org/conda-forge/llvm-tools) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/llvm-tools.svg)](https://anaconda.org/conda-forge/llvm-tools) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/llvm-tools.svg)](https://anaconda.org/conda-forge/llvm-tools) | @@ -99,41 +99,41 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libllvm15, lit, llvm, llvm-tools, llvmdev` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libllvm16, lit, llvm, llvm-tools, llvmdev` can be installed with `conda`: ``` -conda install libllvm15 lit llvm llvm-tools llvmdev +conda install libllvm16 lit llvm llvm-tools llvmdev ``` or with `mamba`: ``` -mamba install libllvm15 lit llvm llvm-tools llvmdev +mamba install libllvm16 lit llvm llvm-tools llvmdev ``` -It is possible to list all of the versions of `libllvm15` available on your platform with `conda`: +It is possible to list all of the versions of `libllvm16` available on your platform with `conda`: ``` -conda search libllvm15 --channel conda-forge +conda search libllvm16 --channel conda-forge ``` or with `mamba`: ``` -mamba search libllvm15 --channel conda-forge +mamba search libllvm16 --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search libllvm15 --channel conda-forge +mamba repoquery search libllvm16 --channel conda-forge -# List packages depending on `libllvm15`: -mamba repoquery whoneeds libllvm15 --channel conda-forge +# List packages depending on `libllvm16`: +mamba repoquery whoneeds libllvm16 --channel conda-forge -# List dependencies of `libllvm15`: -mamba repoquery depends libllvm15 --channel conda-forge +# List dependencies of `libllvm16`: +mamba repoquery depends libllvm16 --channel conda-forge ``` From d0ad5daedfc8421cd9dc3ef02e82ec68fbe5c26b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 Mar 2023 08:33:00 +1100 Subject: [PATCH 5/5] Revert "make ninja verbose" This reverts commit a043d4a73acf1ad7a05001fce02c054c3339e8cb. --- recipe/install_llvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/install_llvm.sh b/recipe/install_llvm.sh index 8575dcb5..3f6c2845 100644 --- a/recipe/install_llvm.sh +++ b/recipe/install_llvm.sh @@ -2,7 +2,7 @@ set -x cd build -ninja --verbose install +ninja install IFS='.' read -ra VER_ARR <<< "$PKG_VERSION"