From de8e67b3ec70036ba59f4639784ce8aa27044e5b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 15 Sep 2023 12:06:39 +1100 Subject: [PATCH 01/30] llvmdev 17.0.0.rc4 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 70c52ed9..8aedb8ed 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.0.rc3" %} +{% set version = "17.0.0.rc4" %} {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates @@ -11,7 +11,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: 60493f4e974fcca7b739aea4901af2d957b0eaea34b42815359be59cf6c88fa2 + sha256: 277d0671a8f389e2ae44f4fe591974bb8434c115a94ed289ab17d13a4de2940e 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 From 1157225e13499833692a69ac09bd013ebc8200e6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 19 Sep 2023 18:51:56 +1100 Subject: [PATCH 02/30] remove rc-channels --- recipe/conda_build_config.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index ebc2e487..15045a91 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -5,6 +5,3 @@ cxx_compiler: # [osx] MACOSX_SDK_VERSION: # [osx and x86_64] - 10.12 # [osx and x86_64] - -channel_targets: - - conda-forge llvm_rc From 364bfab3c7c61dd8b6882e49677304ca1f03863e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 19 Sep 2023 18:52:32 +1100 Subject: [PATCH 03/30] llvmdev 17.0.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 70c52ed9..8d7e653d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.0.rc3" %} +{% set version = "17.0.0" %} {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates @@ -11,7 +11,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: 60493f4e974fcca7b739aea4901af2d957b0eaea34b42815359be59cf6c88fa2 + sha256: e71ba1f238c47d6cc6a747ce3a407bfd0c3bf81cd7e10ba88b45c47f740efcbd 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 From 3d0cb4fe829f8ad3deb325305f72f58142db48f3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 19 Sep 2023 18:54:08 +1100 Subject: [PATCH 04/30] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and conda-forge-pinning 2023.09.19.07.30.00 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/migrations/libxml2211.yaml | 7 ------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- 7 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 .ci_support/migrations/libxml2211.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 7bf71586..9c5a13ca 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -3,7 +3,7 @@ cdt_name: channel_sources: - 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 10499c7f..eba6be28 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -7,7 +7,7 @@ cdt_name: channel_sources: - 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 9814f528..6f78605c 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -3,7 +3,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/migrations/libxml2211.yaml b/.ci_support/migrations/libxml2211.yaml deleted file mode 100644 index 9bce3143..00000000 --- a/.ci_support/migrations/libxml2211.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libxml2: -- '2.11' -migrator_ts: 1684203491.9767957 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 65b9b45f..d3243cd2 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: channel_sources: - 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 fabc1fdf..5e935164 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: channel_sources: - 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 a62f6bce..91b95feb 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,7 @@ channel_sources: - conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - vs2019 libxml2: From 317e4b738b1b418ed8b9a9f7542f2ad1422991a8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 19 Sep 2023 19:12:38 +1100 Subject: [PATCH 05/30] backport patch that removes rc-suffix and missed the GA tag --- recipe/meta.yaml | 3 +++ ...-pass-through-QEMU_LD_PREFIX-SDKROOT.patch | 4 ++-- .../0002-restore-macos-10.9-support.patch | 4 ++-- recipe/patches/0003-Remove-RC-suffix.patch | 22 +++++++++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 recipe/patches/0003-Remove-RC-suffix.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8d7e653d..a9ea6476 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,6 +18,9 @@ source: # - patches/amd-roc-2.7.0.diff - patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch - patches/0002-restore-macos-10.9-support.patch + # backport https://github.com/llvm/llvm-project/commit/01f8ba70ac1c82590b63162ad6e410e787a871b0, + # which landed just after the 17.0.0 tag + - patches/0003-Remove-RC-suffix.patch build: number: 0 diff --git a/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch b/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch index 248679ac..69ce3d67 100644 --- a/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch +++ b/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch @@ -1,7 +1,7 @@ -From 9785311db13f81e83440786feae2a525bbc1ad56 Mon Sep 17 00:00:00 2001 +From 6ed9584620b6e793d3a53cfeb7f5117f506d9fc5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 4 Aug 2020 21:06:30 -0500 -Subject: [PATCH 1/2] pass through QEMU_LD_PREFIX & SDKROOT +Subject: [PATCH 1/3] pass through QEMU_LD_PREFIX & SDKROOT --- llvm/utils/lit/lit/TestingConfig.py | 2 ++ diff --git a/recipe/patches/0002-restore-macos-10.9-support.patch b/recipe/patches/0002-restore-macos-10.9-support.patch index 70c686f4..6e01620f 100644 --- a/recipe/patches/0002-restore-macos-10.9-support.patch +++ b/recipe/patches/0002-restore-macos-10.9-support.patch @@ -1,7 +1,7 @@ -From 5afccfa67d5ca66293bfea6db090aaabfb31f357 Mon Sep 17 00:00:00 2001 +From 79768b2d1936e0d5e2858bda957342d6fe691f89 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 22 Mar 2023 12:25:49 -0500 -Subject: [PATCH 2/2] restore macos 10.9 support +Subject: [PATCH 2/3] restore macos 10.9 support ThreadPriority::Low is mapped to ThreadPriority::Background just like Linux/Windows when macOS is version 10.9 diff --git a/recipe/patches/0003-Remove-RC-suffix.patch b/recipe/patches/0003-Remove-RC-suffix.patch new file mode 100644 index 00000000..f64da0f2 --- /dev/null +++ b/recipe/patches/0003-Remove-RC-suffix.patch @@ -0,0 +1,22 @@ +From 76c2683487cb2a572087d2c841a869a13ba39524 Mon Sep 17 00:00:00 2001 +From: Tobias Hieta +Date: Tue, 19 Sep 2023 09:44:33 +0200 +Subject: [PATCH 3/3] Remove RC suffix + +--- + llvm/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt +index 3a591b112f55..6c1c6600771d 100644 +--- a/llvm/CMakeLists.txt ++++ b/llvm/CMakeLists.txt +@@ -18,7 +18,7 @@ if(NOT DEFINED LLVM_VERSION_PATCH) + set(LLVM_VERSION_PATCH 0) + endif() + if(NOT DEFINED LLVM_VERSION_SUFFIX) +- set(LLVM_VERSION_SUFFIX rc) ++ set(LLVM_VERSION_SUFFIX) + endif() + + if (NOT PACKAGE_VERSION) From 9be6a9a96433f125c415db17df2e18c652a31f9e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 19 Sep 2023 20:24:19 +1100 Subject: [PATCH 06/30] llvmdev 17.0.1 .0 got pulled because of the suffix issue, see https://discourse.llvm.org/t/llvm-17-0-0-tagged-but-with-a-mistake/73545 --- recipe/meta.yaml | 7 ++---- ...-pass-through-QEMU_LD_PREFIX-SDKROOT.patch | 4 ++-- .../0002-restore-macos-10.9-support.patch | 4 ++-- recipe/patches/0003-Remove-RC-suffix.patch | 22 ------------------- 4 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 recipe/patches/0003-Remove-RC-suffix.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a9ea6476..a2be361c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.0" %} +{% set version = "17.0.1" %} {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates @@ -11,16 +11,13 @@ 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: e71ba1f238c47d6cc6a747ce3a407bfd0c3bf81cd7e10ba88b45c47f740efcbd + sha256: b0e42aafc01ece2ca2b42e3526f54bebc4b1f1dc8de6e34f46a0446a13e882b9 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 # - patches/amd-roc-2.7.0.diff - patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch - patches/0002-restore-macos-10.9-support.patch - # backport https://github.com/llvm/llvm-project/commit/01f8ba70ac1c82590b63162ad6e410e787a871b0, - # which landed just after the 17.0.0 tag - - patches/0003-Remove-RC-suffix.patch build: number: 0 diff --git a/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch b/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch index 69ce3d67..f898c3d2 100644 --- a/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch +++ b/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch @@ -1,7 +1,7 @@ -From 6ed9584620b6e793d3a53cfeb7f5117f506d9fc5 Mon Sep 17 00:00:00 2001 +From 98d274ca29c5ede687835eb0fd788c5e33617298 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 4 Aug 2020 21:06:30 -0500 -Subject: [PATCH 1/3] pass through QEMU_LD_PREFIX & SDKROOT +Subject: [PATCH 1/2] pass through QEMU_LD_PREFIX & SDKROOT --- llvm/utils/lit/lit/TestingConfig.py | 2 ++ diff --git a/recipe/patches/0002-restore-macos-10.9-support.patch b/recipe/patches/0002-restore-macos-10.9-support.patch index 6e01620f..458d1ccf 100644 --- a/recipe/patches/0002-restore-macos-10.9-support.patch +++ b/recipe/patches/0002-restore-macos-10.9-support.patch @@ -1,7 +1,7 @@ -From 79768b2d1936e0d5e2858bda957342d6fe691f89 Mon Sep 17 00:00:00 2001 +From 721625044d3b421d647a436b682289fa17533284 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 22 Mar 2023 12:25:49 -0500 -Subject: [PATCH 2/3] restore macos 10.9 support +Subject: [PATCH 2/2] restore macos 10.9 support ThreadPriority::Low is mapped to ThreadPriority::Background just like Linux/Windows when macOS is version 10.9 diff --git a/recipe/patches/0003-Remove-RC-suffix.patch b/recipe/patches/0003-Remove-RC-suffix.patch deleted file mode 100644 index f64da0f2..00000000 --- a/recipe/patches/0003-Remove-RC-suffix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 76c2683487cb2a572087d2c841a869a13ba39524 Mon Sep 17 00:00:00 2001 -From: Tobias Hieta -Date: Tue, 19 Sep 2023 09:44:33 +0200 -Subject: [PATCH 3/3] Remove RC suffix - ---- - llvm/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt -index 3a591b112f55..6c1c6600771d 100644 ---- a/llvm/CMakeLists.txt -+++ b/llvm/CMakeLists.txt -@@ -18,7 +18,7 @@ if(NOT DEFINED LLVM_VERSION_PATCH) - set(LLVM_VERSION_PATCH 0) - endif() - if(NOT DEFINED LLVM_VERSION_SUFFIX) -- set(LLVM_VERSION_SUFFIX rc) -+ set(LLVM_VERSION_SUFFIX) - endif() - - if (NOT PACKAGE_VERSION) From 197437d1438ed2429385d33e9ae775486bbf1517 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 19 Sep 2023 23:58:45 +1100 Subject: [PATCH 07/30] add missing jinja-filter to make if-condition work --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a2be361c..dc344854 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,7 @@ {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates -{% set extra = "rc" if version.split(".")[-1] not in range(7) else "" %} +{% set extra = "rc" if version.split(".")[-1]|int not in range(7) else "" %} {% set extra = "git" if version.split(".")[-1] == "dev0" else extra %} package: From f2b7976a4c0f571aedcc261b29f9085883347b0b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 26 Sep 2023 14:28:23 +1100 Subject: [PATCH 08/30] [ci skip] update abi_migration_branches --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 056b1f9a..efbb4ac8 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,7 @@ bot: abi_migration_branches: + - 16.x - 15.x - - 14.x build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 From 1da8ac9aa1a9005d5b2a08866233b1825a81b638 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 3 Oct 2023 09:07:38 +0000 Subject: [PATCH 09/30] updated v17.0.2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc344854..1e87f9d7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.1" %} +{% set version = "17.0.2" %} {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates @@ -11,7 +11,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: b0e42aafc01ece2ca2b42e3526f54bebc4b1f1dc8de6e34f46a0446a13e882b9 + sha256: 351562b14d42fcefcbf00cc1f327680a1062bbbf67a1e1ca6acb64c473b06394 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 From f4133719e8bded8bb3d1bc870fc1a8c1bbfbae55 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 3 Oct 2023 09:08:36 +0000 Subject: [PATCH 10/30] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.26.3, and conda-forge-pinning 2023.10.03.06.56.23 --- .azure-pipelines/azure-pipelines-win.yml | 56 ++--------- .ci_support/linux_64_.yaml | 1 + .scripts/build_steps.sh | 9 +- .scripts/logging_utils.sh | 4 +- .scripts/run_osx_build.sh | 8 +- .scripts/run_win_build.bat | 115 +++++++++++++++++++++++ 6 files changed, 134 insertions(+), 59 deletions(-) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d66c7d15..82c5318e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,6 +17,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -35,55 +36,14 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - 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 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - 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 - env: + CONFIG: $(CONFIG) + CI: azure + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 9c5a13ca..bee2b02f 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -18,6 +18,7 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +- 3.11.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6b..322832b9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - 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 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c2..aff009f0 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3969edf3..cd9a88f2 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} 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 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 00000000..07d34456 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,115 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file From f5dbd72d201abf95a678f1088799d67475329cb7 Mon Sep 17 00:00:00 2001 From: Francesco Biscani Date: Fri, 6 Oct 2023 16:05:11 +0200 Subject: [PATCH 11/30] Tentative patch for fixing missing lljit symbols. --- recipe/meta.yaml | 3 +- recipe/patches/0003-fix-lljit-symbols.patch | 193 ++++++++++++++++++++ 2 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 recipe/patches/0003-fix-lljit-symbols.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1e87f9d7..116ac1ac 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,9 +18,10 @@ source: # - patches/amd-roc-2.7.0.diff - patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch - patches/0002-restore-macos-10.9-support.patch + - patches/0003-fix-lljit-symbols.patch build: - number: 0 + number: 1 merge_build_host: false requirements: diff --git a/recipe/patches/0003-fix-lljit-symbols.patch b/recipe/patches/0003-fix-lljit-symbols.patch new file mode 100644 index 00000000..85a304aa --- /dev/null +++ b/recipe/patches/0003-fix-lljit-symbols.patch @@ -0,0 +1,193 @@ +diff --git a/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h b/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h +index 9772c84b682a53b..182e9ed1041a63c 100644 +--- a/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h ++++ b/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h +@@ -33,24 +33,23 @@ class EPCEHFrameRegistrar : public jitlink::EHFrameRegistrar { + /// find the registration functions. If it is None then the process dylib + /// will be loaded to find the registration functions. + static Expected> +- Create(ExecutionSession &ES, +- std::optional RegistrationFunctionsDylib = std::nullopt); ++ Create(ExecutionSession &ES); + + /// Create a EPCEHFrameRegistrar with the given ExecutorProcessControl + /// object and registration/deregistration function addresses. + EPCEHFrameRegistrar(ExecutionSession &ES, +- ExecutorAddr RegisterEHFrameWrapperFnAddr, +- ExecutorAddr DeregisterEHFRameWrapperFnAddr) +- : ES(ES), RegisterEHFrameWrapperFnAddr(RegisterEHFrameWrapperFnAddr), +- DeregisterEHFrameWrapperFnAddr(DeregisterEHFRameWrapperFnAddr) {} ++ ExecutorAddr RegisterEHFrameSectionWrapper, ++ ExecutorAddr DeregisterEHFRameSectionWrapper) ++ : ES(ES), RegisterEHFrameSectionWrapper(RegisterEHFrameSectionWrapper), ++ DeregisterEHFrameSectionWrapper(DeregisterEHFRameSectionWrapper) {} + + Error registerEHFrames(ExecutorAddrRange EHFrameSection) override; + Error deregisterEHFrames(ExecutorAddrRange EHFrameSection) override; + + private: + ExecutionSession &ES; +- ExecutorAddr RegisterEHFrameWrapperFnAddr; +- ExecutorAddr DeregisterEHFrameWrapperFnAddr; ++ ExecutorAddr RegisterEHFrameSectionWrapper; ++ ExecutorAddr DeregisterEHFrameSectionWrapper; + }; + + } // end namespace orc +diff --git a/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp b/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp +index 56cd982cd5e1f00..49af3f3d01244fa 100644 +--- a/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp ++++ b/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp +@@ -9,67 +9,40 @@ + #include "llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h" + + #include "llvm/ExecutionEngine/Orc/Core.h" +-#include "llvm/Support/BinaryStreamWriter.h" ++#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h" + + using namespace llvm::orc::shared; + + namespace llvm { + namespace orc { + +-Expected> EPCEHFrameRegistrar::Create( +- ExecutionSession &ES, +- std::optional RegistrationFunctionsDylib) { +- // FIXME: Proper mangling here -- we really need to decouple linker mangling +- // from DataLayout. +- +- // Find the addresses of the registration/deregistration functions in the +- // executor process. +- auto &EPC = ES.getExecutorProcessControl(); +- +- if (!RegistrationFunctionsDylib) { +- if (auto D = EPC.loadDylib(nullptr)) +- RegistrationFunctionsDylib = *D; +- else +- return D.takeError(); +- } +- +- std::string RegisterWrapperName, DeregisterWrapperName; +- if (EPC.getTargetTriple().isOSBinFormatMachO()) { +- RegisterWrapperName += '_'; +- DeregisterWrapperName += '_'; +- } +- RegisterWrapperName += "llvm_orc_registerEHFrameSectionWrapper"; +- DeregisterWrapperName += "llvm_orc_deregisterEHFrameSectionWrapper"; +- +- SymbolLookupSet RegistrationSymbols; +- RegistrationSymbols.add(EPC.intern(RegisterWrapperName)); +- RegistrationSymbols.add(EPC.intern(DeregisterWrapperName)); +- +- auto Result = +- EPC.lookupSymbols({{*RegistrationFunctionsDylib, RegistrationSymbols}}); +- if (!Result) +- return Result.takeError(); +- +- assert(Result->size() == 1 && "Unexpected number of dylibs in result"); +- assert((*Result)[0].size() == 2 && +- "Unexpected number of addresses in result"); +- +- auto RegisterEHFrameWrapperFnAddr = (*Result)[0][0]; +- auto DeregisterEHFrameWrapperFnAddr = (*Result)[0][1]; +- +- return std::make_unique(ES, RegisterEHFrameWrapperFnAddr, +- DeregisterEHFrameWrapperFnAddr); ++Expected> ++EPCEHFrameRegistrar::Create(ExecutionSession &ES) { ++ ++ // Lookup addresseses of the registration/deregistration functions in the ++ // bootstrap map. ++ ExecutorAddr RegisterEHFrameSectionWrapper; ++ ExecutorAddr DeregisterEHFrameSectionWrapper; ++ if (auto Err = ES.getExecutorProcessControl().getBootstrapSymbols( ++ {{RegisterEHFrameSectionWrapper, ++ rt::RegisterEHFrameSectionWrapperName}, ++ {DeregisterEHFrameSectionWrapper, ++ rt::DeregisterEHFrameSectionWrapperName}})) ++ return Err; ++ ++ return std::make_unique( ++ ES, RegisterEHFrameSectionWrapper, DeregisterEHFrameSectionWrapper); + } + + Error EPCEHFrameRegistrar::registerEHFrames(ExecutorAddrRange EHFrameSection) { + return ES.callSPSWrapper( +- RegisterEHFrameWrapperFnAddr, EHFrameSection); ++ RegisterEHFrameSectionWrapper, EHFrameSection); + } + + Error EPCEHFrameRegistrar::deregisterEHFrames( + ExecutorAddrRange EHFrameSection) { + return ES.callSPSWrapper( +- DeregisterEHFrameWrapperFnAddr, EHFrameSection); ++ DeregisterEHFrameSectionWrapper, EHFrameSection); + } + + } // end namespace orc +diff --git a/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp b/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp +index b8b013f8a7a9d74..fc928f2e6146bf5 100644 +--- a/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp ++++ b/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp +@@ -9,6 +9,8 @@ + #include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h" + + #include "llvm/ExecutionEngine/Orc/Core.h" ++#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h" ++#include "llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h" + #include "llvm/ExecutionEngine/Orc/TargetProcess/TargetExecutionUtils.h" + #include "llvm/Support/FormatVariadic.h" + #include "llvm/Support/Process.h" +@@ -42,6 +44,11 @@ SelfExecutorProcessControl::SelfExecutorProcessControl( + ExecutorAddr::fromPtr(this)}; + if (this->TargetTriple.isOSBinFormatMachO()) + GlobalManglingPrefix = '_'; ++ ++ this->BootstrapSymbols[rt::RegisterEHFrameSectionWrapperName] = ++ ExecutorAddr::fromPtr(&llvm_orc_registerEHFrameSectionWrapper); ++ this->BootstrapSymbols[rt::DeregisterEHFrameSectionWrapperName] = ++ ExecutorAddr::fromPtr(&llvm_orc_deregisterEHFrameSectionWrapper); + } + + Expected> +diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp b/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp +index 86e31c52100ea64..ae39b1d1bfaa9d6 100644 +--- a/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp ++++ b/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp +@@ -51,9 +51,9 @@ const char *MemoryWriteBuffersWrapperName = + "__llvm_orc_bootstrap_mem_write_buffers_wrapper"; + + const char *RegisterEHFrameSectionWrapperName = +- "__llvm_orc_bootstrap_register_ehframe_section_wrapper"; ++ "llvm_orc_registerEHFrameSectionWrapper"; + const char *DeregisterEHFrameSectionWrapperName = +- "__llvm_orc_bootstrap_deregister_ehframe_section_wrapper"; ++ "llvm_orc_deregisterEHFrameSectionWrapper"; + + const char *RunAsMainWrapperName = "__llvm_orc_bootstrap_run_as_main_wrapper"; + const char *RunAsVoidFunctionWrapperName = +diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp +index 67bc379f9821154..a585767bf474e60 100644 +--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp ++++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp +@@ -8,7 +8,9 @@ + + #include "llvm/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.h" + ++#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h" + #include "llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h" ++#include "llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h" + #include "llvm/Support/FormatVariadic.h" + #include "llvm/Support/Process.h" + #include "llvm/TargetParser/Host.h" +@@ -206,6 +208,10 @@ Error SimpleRemoteEPCServer::sendSetupMessage( + "Dispatch function name should not be set"); + EI.BootstrapSymbols[ExecutorSessionObjectName] = ExecutorAddr::fromPtr(this); + EI.BootstrapSymbols[DispatchFnName] = ExecutorAddr::fromPtr(jitDispatchEntry); ++ EI.BootstrapSymbols[rt::RegisterEHFrameSectionWrapperName] = ++ ExecutorAddr::fromPtr(&llvm_orc_registerEHFrameSectionWrapper); ++ EI.BootstrapSymbols[rt::DeregisterEHFrameSectionWrapperName] = ++ ExecutorAddr::fromPtr(&llvm_orc_deregisterEHFrameSectionWrapper); + + using SPSSerialize = + shared::SPSArgList; From e4d3afaebf3d6eaa69699625a84b2a2c1a9263b0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 8 Oct 2023 07:49:23 +1100 Subject: [PATCH 12/30] fix patch format & metadata --- recipe/meta.yaml | 4 ++- ...-pass-through-QEMU_LD_PREFIX-SDKROOT.patch | 4 +-- .../0002-restore-macos-10.9-support.patch | 4 +-- ...trap-symbols-to-communicate-eh-fram.patch} | 32 +++++++++++++++---- 4 files changed, 33 insertions(+), 11 deletions(-) rename recipe/patches/{0003-fix-lljit-symbols.patch => 0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch} (87%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 116ac1ac..bafa041a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,9 @@ source: # - patches/amd-roc-2.7.0.diff - patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch - patches/0002-restore-macos-10.9-support.patch - - patches/0003-fix-lljit-symbols.patch + # backports patch for issues with LLJIT, see + # https://github.com/llvm/llvm-project/commit/122ebe3b500190b1f408e2e6db753853e297ba28 + - patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch build: number: 1 diff --git a/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch b/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch index f898c3d2..e4de8fdd 100644 --- a/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch +++ b/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch @@ -1,7 +1,7 @@ -From 98d274ca29c5ede687835eb0fd788c5e33617298 Mon Sep 17 00:00:00 2001 +From 31304a973e57a2f41219fd8be2f39143e14dde11 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 4 Aug 2020 21:06:30 -0500 -Subject: [PATCH 1/2] pass through QEMU_LD_PREFIX & SDKROOT +Subject: [PATCH 1/3] pass through QEMU_LD_PREFIX & SDKROOT --- llvm/utils/lit/lit/TestingConfig.py | 2 ++ diff --git a/recipe/patches/0002-restore-macos-10.9-support.patch b/recipe/patches/0002-restore-macos-10.9-support.patch index 458d1ccf..6a64010e 100644 --- a/recipe/patches/0002-restore-macos-10.9-support.patch +++ b/recipe/patches/0002-restore-macos-10.9-support.patch @@ -1,7 +1,7 @@ -From 721625044d3b421d647a436b682289fa17533284 Mon Sep 17 00:00:00 2001 +From 5a0157c1ec9881737279adab8fdfd5482d45c781 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 22 Mar 2023 12:25:49 -0500 -Subject: [PATCH 2/2] restore macos 10.9 support +Subject: [PATCH 2/3] restore macos 10.9 support ThreadPriority::Low is mapped to ThreadPriority::Background just like Linux/Windows when macOS is version 10.9 diff --git a/recipe/patches/0003-fix-lljit-symbols.patch b/recipe/patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch similarity index 87% rename from recipe/patches/0003-fix-lljit-symbols.patch rename to recipe/patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch index 85a304aa..97ed07e4 100644 --- a/recipe/patches/0003-fix-lljit-symbols.patch +++ b/recipe/patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch @@ -1,8 +1,28 @@ +From 289e985d54469a51433d78294bcb161b7c32fefd Mon Sep 17 00:00:00 2001 +From: Lang Hames +Date: Wed, 23 Aug 2023 13:39:19 -0700 +Subject: [PATCH 3/3] [ORC] Use EPC bootstrap symbols to communicate eh-frame + registration fn addrs. + +By using bootstrap symbols to communicate these addresseses, rather than dlsym +lookups, we no longer need them to be exported from the main executable. On ELF, +where symbols aren't exported from the main executable by default, this +eliminates a common source of missing symbol errors and allows for smaller +executables (if exports from the main executable aren't otherwise needed and +can be removed). +--- + .../ExecutionEngine/Orc/EPCEHFrameRegistrar.h | 15 ++--- + .../Orc/EPCEHFrameRegistrar.cpp | 65 ++++++------------- + .../Orc/ExecutorProcessControl.cpp | 7 ++ + .../Orc/Shared/OrcRTBridge.cpp | 4 +- + .../TargetProcess/SimpleRemoteEPCServer.cpp | 6 ++ + 5 files changed, 41 insertions(+), 56 deletions(-) + diff --git a/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h b/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h -index 9772c84b682a53b..182e9ed1041a63c 100644 +index 9772c84b682a..182e9ed1041a 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h -@@ -33,24 +33,23 @@ class EPCEHFrameRegistrar : public jitlink::EHFrameRegistrar { +@@ -33,24 +33,23 @@ public: /// find the registration functions. If it is None then the process dylib /// will be loaded to find the registration functions. static Expected> @@ -35,7 +55,7 @@ index 9772c84b682a53b..182e9ed1041a63c 100644 } // end namespace orc diff --git a/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp b/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp -index 56cd982cd5e1f00..49af3f3d01244fa 100644 +index 56cd982cd5e1..49af3f3d0124 100644 --- a/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp +++ b/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp @@ -9,67 +9,40 @@ @@ -126,7 +146,7 @@ index 56cd982cd5e1f00..49af3f3d01244fa 100644 } // end namespace orc diff --git a/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp b/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp -index b8b013f8a7a9d74..fc928f2e6146bf5 100644 +index b8b013f8a7a9..fc928f2e6146 100644 --- a/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp +++ b/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp @@ -9,6 +9,8 @@ @@ -151,7 +171,7 @@ index b8b013f8a7a9d74..fc928f2e6146bf5 100644 Expected> diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp b/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp -index 86e31c52100ea64..ae39b1d1bfaa9d6 100644 +index 86e31c52100e..ae39b1d1bfaa 100644 --- a/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp +++ b/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp @@ -51,9 +51,9 @@ const char *MemoryWriteBuffersWrapperName = @@ -167,7 +187,7 @@ index 86e31c52100ea64..ae39b1d1bfaa9d6 100644 const char *RunAsMainWrapperName = "__llvm_orc_bootstrap_run_as_main_wrapper"; const char *RunAsVoidFunctionWrapperName = diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp -index 67bc379f9821154..a585767bf474e60 100644 +index 67bc379f9821..a585767bf474 100644 --- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp +++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp @@ -8,7 +8,9 @@ From 7a2bacf272fd3edcd143d70af681d369db4e6325 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 17 Oct 2023 08:08:08 +0000 Subject: [PATCH 13/30] updated v17.0.3 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bafa041a..aebfa26d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.2" %} +{% set version = "17.0.3" %} {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates @@ -11,7 +11,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: 351562b14d42fcefcbf00cc1f327680a1062bbbf67a1e1ca6acb64c473b06394 + sha256: be5a1e44d64f306bb44fce7d36e3b3993694e8e6122b2348608906283c176db8 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 @@ -23,7 +23,7 @@ source: - patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch build: - number: 1 + number: 0 merge_build_host: false requirements: From 4e33c810c7aebf2522007e0eae99ce0cc23c5d35 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 17 Oct 2023 08:08:51 +0000 Subject: [PATCH 14/30] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.10.17.07.56.56 --- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index d3243cd2..0ac8b917 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '15' +- '16' libxml2: - '2.11' macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 5e935164..716f433b 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '15' +- '16' libxml2: - '2.11' macos_machine: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 322832b9..bd9e6710 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,7 +34,7 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ pip mamba conda-build boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build 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 cd9a88f2..870c49aa 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,7 +26,7 @@ conda activate base mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ pip mamba conda-build boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build boa conda-forge-ci-setup=3 From cd8cb5b9bca1ee287cbd3693610d5e8aa2c65798 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 8 Feb 2022 12:32:18 +1100 Subject: [PATCH 15/30] add run-constraints for #141 --- recipe/meta.yaml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aebfa26d..551b058f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -69,6 +69,11 @@ outputs: - {{ pin_subpackage("libllvm-c" + major_ver, exact=True) }} # [win] - {{ pin_subpackage("llvm-tools", exact=True) }} - libcxx >={{ cxx_compiler_version }} # [osx] + run_constrained: + - llvm {{ version }} + - llvm-tools {{ version }} + - clang {{ version }} + - clang-tools {{ version }} test: requires: - ripgrep # [win] @@ -129,8 +134,11 @@ outputs: - zstd run: # [not win] - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} # [not win] - run_constrained: # [not win] - - llvmdev {{ version }} # [not win] + run_constrained: + - llvmdev {{ version }} + - llvm-tools {{ version }} + - clang {{ version }} + - clang-tools {{ version }} test: commands: - echo "Hello World!" @@ -157,7 +165,10 @@ outputs: run: - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} run_constrained: - - llvmdev {{ version }} + - llvm {{ version }} + - llvmdev {{ version }} + - clang {{ version }} + - clang-tools {{ version }} test: commands: - $PREFIX/bin/llc -version # [not win] From a786dcd08d88011d4db87d0f69c45398101a81bc Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 22 Oct 2023 16:17:56 +1100 Subject: [PATCH 16/30] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 551b058f..a1838ea2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ source: - patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch build: - number: 0 + number: 1 merge_build_host: false requirements: From 644fb0e37be55c75c66ef63c208f4a9e6a2c36e7 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 31 Oct 2023 09:34:11 +0000 Subject: [PATCH 17/30] updated v17.0.4 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a1838ea2..e5876e61 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.3" %} +{% set version = "17.0.4" %} {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates @@ -11,7 +11,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: be5a1e44d64f306bb44fce7d36e3b3993694e8e6122b2348608906283c176db8 + sha256: a225eb96f52e7d8c6c275b351fcc66d7a21d925eecff53730900404f244ff16a 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 @@ -23,7 +23,7 @@ source: - patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch build: - number: 1 + number: 0 merge_build_host: false requirements: From b2ddca1630657941d0d1b945b8c9645e9d8d1eca Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 14 Nov 2023 11:06:04 +0000 Subject: [PATCH 18/30] updated v17.0.5 --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e5876e61..4b9b0808 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.4" %} +{% set version = "17.0.5" %} {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates @@ -11,7 +11,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: a225eb96f52e7d8c6c275b351fcc66d7a21d925eecff53730900404f244ff16a + sha256: 95d7eff82945cf05c16a1851d7b391fc2da726b87c1138125e3b6e4d300ab834 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 @@ -44,7 +44,7 @@ requirements: outputs: # Contains everything - name: llvmdev - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: activate_in_script: true @@ -98,7 +98,7 @@ outputs: script: install_llvm.sh # [not win] build: activate_in_script: true - run_exports: # [not win] + run_exports: # [not win] - {{ pin_subpackage("libllvm" + major_ver, max_pin="x.x") }} # [not win] requirements: build: @@ -123,7 +123,7 @@ outputs: # for run_exports - name: llvm build: - run_exports: # [not win] + run_exports: # [not win] - {{ pin_subpackage("libllvm" + major_ver, max_pin="x.x") }} # [not win] requirements: build: @@ -132,7 +132,7 @@ outputs: - libxml2 - zlib - zstd - run: # [not win] + run: # [not win] - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} # [not win] run_constrained: - llvmdev {{ version }} @@ -145,7 +145,7 @@ outputs: # Contains LLVM tools - name: llvm-tools - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: activate_in_script: true @@ -177,7 +177,7 @@ outputs: # Contains LLVM-C shared library - name: libllvm-c{{ major_ver }} - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: run_exports: From cfa3f7187afbf87577cbc58829761e116a0058fb Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 14 Nov 2023 11:06:38 +0000 Subject: [PATCH 19/30] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.29.0, and conda-forge-pinning 2023.11.14.10.31.11 --- .azure-pipelines/azure-pipelines-linux.yml | 3 +++ .azure-pipelines/azure-pipelines-osx.yml | 3 +++ .azure-pipelines/azure-pipelines-win.yml | 3 +++ .scripts/build_steps.sh | 17 +++++++++++++---- .scripts/run_docker_build.sh | 3 +++ .scripts/run_osx_build.sh | 15 +++++++++++---- .scripts/run_win_build.bat | 12 ++++++++++-- README.md | 2 +- 8 files changed, 47 insertions(+), 11 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index fcb0974c..2b93a123 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -33,6 +33,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8032e967..f3ff0633 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -20,6 +20,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 82c5318e..d609fcdf 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -42,6 +42,9 @@ jobs: PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index bd9e6710..064e539a 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -55,6 +57,12 @@ 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}" @@ -66,9 +74,10 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..b70ef014 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 870c49aa..46ab346d 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,10 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 07d34456..5b2b8492 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -17,10 +17,14 @@ call :start_group "Configuring conda" :: Activate the base conda environment call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -41,11 +45,15 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" ) +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index 31caff91..56ce4927 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ available continuous integration services. Thanks to the awesome service provide [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/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance From b2f6b81adfe8ed2b0eb5cc2279861c70a9008bc9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 Nov 2023 06:18:49 +1100 Subject: [PATCH 20/30] [ci skip] undo bot mess up --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4b9b0808..b80a93fa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -44,7 +44,7 @@ requirements: outputs: # Contains everything - name: llvmdev - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: activate_in_script: true @@ -98,7 +98,7 @@ outputs: script: install_llvm.sh # [not win] build: activate_in_script: true - run_exports: # [not win] + run_exports: # [not win] - {{ pin_subpackage("libllvm" + major_ver, max_pin="x.x") }} # [not win] requirements: build: @@ -123,7 +123,7 @@ outputs: # for run_exports - name: llvm build: - run_exports: # [not win] + run_exports: # [not win] - {{ pin_subpackage("libllvm" + major_ver, max_pin="x.x") }} # [not win] requirements: build: @@ -132,7 +132,7 @@ outputs: - libxml2 - zlib - zstd - run: # [not win] + run: # [not win] - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} # [not win] run_constrained: - llvmdev {{ version }} @@ -145,7 +145,7 @@ outputs: # Contains LLVM tools - name: llvm-tools - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: activate_in_script: true @@ -177,7 +177,7 @@ outputs: # Contains LLVM-C shared library - name: libllvm-c{{ major_ver }} - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: run_exports: From 8c2a21ffb8789ac84901d04921b678633fc5b1e3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 28 Nov 2023 14:10:24 +0000 Subject: [PATCH 21/30] updated v17.0.6 --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b80a93fa..e767437d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.5" %} +{% set version = "17.0.6" %} {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates @@ -11,7 +11,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: 95d7eff82945cf05c16a1851d7b391fc2da726b87c1138125e3b6e4d300ab834 + sha256: 58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813 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 @@ -44,7 +44,7 @@ requirements: outputs: # Contains everything - name: llvmdev - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: activate_in_script: true @@ -98,7 +98,7 @@ outputs: script: install_llvm.sh # [not win] build: activate_in_script: true - run_exports: # [not win] + run_exports: # [not win] - {{ pin_subpackage("libllvm" + major_ver, max_pin="x.x") }} # [not win] requirements: build: @@ -123,7 +123,7 @@ outputs: # for run_exports - name: llvm build: - run_exports: # [not win] + run_exports: # [not win] - {{ pin_subpackage("libllvm" + major_ver, max_pin="x.x") }} # [not win] requirements: build: @@ -132,7 +132,7 @@ outputs: - libxml2 - zlib - zstd - run: # [not win] + run: # [not win] - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} # [not win] run_constrained: - llvmdev {{ version }} @@ -145,7 +145,7 @@ outputs: # Contains LLVM tools - name: llvm-tools - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: activate_in_script: true @@ -177,7 +177,7 @@ outputs: # Contains LLVM-C shared library - name: libllvm-c{{ major_ver }} - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: run_exports: From c439feef4217c838211233ca235197312548553d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 28 Nov 2023 14:10:58 +0000 Subject: [PATCH 22/30] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.30.0, and conda-forge-pinning 2023.11.27.19.54.17 --- .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 064e539a..eba1dfdb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -74,7 +74,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --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:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 46ab346d..9259eb93 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --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" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 5b2b8492..7d2fdd6b 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -53,7 +53,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step From 5b6022116b159c5b05537be59aa54b3272ea99bc Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:52:36 +0000 Subject: [PATCH 23/30] Rebuild for libxml2212 --- .ci_support/migrations/libxml2212.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libxml2212.yaml diff --git a/.ci_support/migrations/libxml2212.yaml b/.ci_support/migrations/libxml2212.yaml new file mode 100644 index 00000000..fff473a2 --- /dev/null +++ b/.ci_support/migrations/libxml2212.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libxml2: +- '2.12' +migrator_ts: 1700445986.2150207 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e767437d..f195fad1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ source: - patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch build: - number: 0 + number: 1 merge_build_host: false requirements: From 7e8e5674fd02e3349dc9440464a90fad4f89e155 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:53:10 +0000 Subject: [PATCH 24/30] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.30.1, and conda-forge-pinning 2023.11.30.10.25.01 --- .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 +- .ci_support/win_64_.yaml | 2 +- .scripts/run_win_build.bat | 4 +++- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index bee2b02f..7438d725 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.11' +- '2.12' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index eba6be28..878ee600 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.11' +- '2.12' target_platform: - linux-aarch64 zlib: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 6f78605c..ffca0962 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.11' +- '2.12' target_platform: - linux-ppc64le zlib: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 0ac8b917..a00fd91e 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -11,7 +11,7 @@ cxx_compiler: cxx_compiler_version: - '16' libxml2: -- '2.11' +- '2.12' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 716f433b..8c98f4eb 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '16' libxml2: -- '2.11' +- '2.12' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 91b95feb..fb64f337 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -5,7 +5,7 @@ channel_targets: cxx_compiler: - vs2019 libxml2: -- '2.11' +- '2.12' target_platform: - win-64 zlib: diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 7d2fdd6b..48734de9 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -42,7 +42,9 @@ if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) ) if NOT [%flow_run_id%] == [] ( From 12394bb24257614bd9b2316d0839572f8f0c7482 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 29 Jan 2024 14:58:27 +0100 Subject: [PATCH 25/30] Revert "remove rc-channels" This reverts commit 1157225e13499833692a69ac09bd013ebc8200e6. --- recipe/conda_build_config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 15045a91..ebc2e487 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -5,3 +5,6 @@ cxx_compiler: # [osx] MACOSX_SDK_VERSION: # [osx and x86_64] - 10.12 # [osx and x86_64] + +channel_targets: + - conda-forge llvm_rc From 4cf85b246be4cb46d2ff555cd66bcac9964eb5d3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 29 Jan 2024 15:02:45 +0100 Subject: [PATCH 26/30] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.26.23.27.14 --- .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 ++-- .gitignore | 25 +++++++++++++++++++++++-- .scripts/build_steps.sh | 6 ------ .scripts/run_docker_build.sh | 6 ++++++ README.md | 16 ++++++++-------- 10 files changed, 49 insertions(+), 28 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 7438d725..2e73b8c2 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -3,7 +3,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.12' +- '2' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 878ee600..e02a7ddb 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -7,7 +7,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.12' +- '2' target_platform: - linux-aarch64 zlib: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index ffca0962..76b13e1f 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -3,7 +3,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.12' +- '2' target_platform: - linux-ppc64le zlib: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a00fd91e..205b704d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,13 +5,13 @@ MACOSX_SDK_VERSION: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: - '16' libxml2: -- '2.12' +- '2' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 8c98f4eb..8d1379f8 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,13 +3,13 @@ MACOSX_DEPLOYMENT_TARGET: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: - '16' libxml2: -- '2.12' +- '2' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index fb64f337..dff998a6 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,11 +1,11 @@ channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - vs2019 libxml2: -- '2.12' +- '2' target_platform: - win-64 zlib: diff --git a/.gitignore b/.gitignore index c89ecb7d..179afe55 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 eba1dfdb..beda247e 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,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 b70ef014..00f377a8 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 56ce4927..97711576 100644 --- a/README.md +++ b/README.md @@ -93,14 +93,14 @@ Current release info Installing llvmdev ================== -Installing `llvmdev` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `llvmdev` 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, `libllvm-c17, libllvm17, lit, llvm, llvm-tools, llvmdev` can be installed with `conda`: +Once the `conda-forge/label/llvm_rc` channel has been enabled, `libllvm-c17, libllvm17, lit, llvm, llvm-tools, llvmdev` can be installed with `conda`: ``` conda install libllvm-c17 libllvm17 lit llvm llvm-tools llvmdev @@ -115,26 +115,26 @@ mamba install libllvm-c17 libllvm17 lit llvm llvm-tools llvmdev It is possible to list all of the versions of `libllvm-c17` available on your platform with `conda`: ``` -conda search libllvm-c17 --channel conda-forge +conda search libllvm-c17 --channel conda-forge/label/llvm_rc ``` or with `mamba`: ``` -mamba search libllvm-c17 --channel conda-forge +mamba search libllvm-c17 --channel conda-forge/label/llvm_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search libllvm-c17 --channel conda-forge +mamba repoquery search libllvm-c17 --channel conda-forge/label/llvm_rc # List packages depending on `libllvm-c17`: -mamba repoquery whoneeds libllvm-c17 --channel conda-forge +mamba repoquery whoneeds libllvm-c17 --channel conda-forge/label/llvm_rc # List dependencies of `libllvm-c17`: -mamba repoquery depends libllvm-c17 --channel conda-forge +mamba repoquery depends libllvm-c17 --channel conda-forge/label/llvm_rc ``` From 26c43b50521fb505c7d0217ba0bda03a6fbb6117 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 29 Jan 2024 15:11:39 +0100 Subject: [PATCH 27/30] llvmdev 18.1.0.rc1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f195fad1..ef4fe3c6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.6" %} +{% set version = "18.1.0.rc1" %} {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates @@ -11,7 +11,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 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 @@ -23,7 +23,7 @@ source: - patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch build: - number: 1 + number: 0 merge_build_host: false requirements: From 35f49ec773d79b653752b61b377f52f787d2334e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 30 Jan 2024 07:26:46 +0100 Subject: [PATCH 28/30] rebase patches --- recipe/meta.yaml | 3 - ...-pass-through-QEMU_LD_PREFIX-SDKROOT.patch | 6 +- .../0002-restore-macos-10.9-support.patch | 6 +- ...strap-symbols-to-communicate-eh-fram.patch | 213 ------------------ 4 files changed, 6 insertions(+), 222 deletions(-) delete mode 100644 recipe/patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ef4fe3c6..d1189998 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,9 +18,6 @@ source: # - patches/amd-roc-2.7.0.diff - patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch - patches/0002-restore-macos-10.9-support.patch - # backports patch for issues with LLJIT, see - # https://github.com/llvm/llvm-project/commit/122ebe3b500190b1f408e2e6db753853e297ba28 - - patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch build: number: 0 diff --git a/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch b/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch index e4de8fdd..a8f1594b 100644 --- a/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch +++ b/recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch @@ -1,14 +1,14 @@ -From 31304a973e57a2f41219fd8be2f39143e14dde11 Mon Sep 17 00:00:00 2001 +From 050ffb2bdf147af9e0f6d0a2e3fd17f9172bdda5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 4 Aug 2020 21:06:30 -0500 -Subject: [PATCH 1/3] pass through QEMU_LD_PREFIX & SDKROOT +Subject: [PATCH 1/2] pass through QEMU_LD_PREFIX & SDKROOT --- llvm/utils/lit/lit/TestingConfig.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/llvm/utils/lit/lit/TestingConfig.py b/llvm/utils/lit/lit/TestingConfig.py -index 76fd66502009..3009e921b621 100644 +index eb9f8de2a7f9..94f50e130adb 100644 --- a/llvm/utils/lit/lit/TestingConfig.py +++ b/llvm/utils/lit/lit/TestingConfig.py @@ -25,6 +25,8 @@ class TestingConfig(object): diff --git a/recipe/patches/0002-restore-macos-10.9-support.patch b/recipe/patches/0002-restore-macos-10.9-support.patch index 6a64010e..73ad37b4 100644 --- a/recipe/patches/0002-restore-macos-10.9-support.patch +++ b/recipe/patches/0002-restore-macos-10.9-support.patch @@ -1,7 +1,7 @@ -From 5a0157c1ec9881737279adab8fdfd5482d45c781 Mon Sep 17 00:00:00 2001 +From 525dc4031ae95878a34f99de7627d8429094fa1f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 22 Mar 2023 12:25:49 -0500 -Subject: [PATCH 2/3] restore macos 10.9 support +Subject: [PATCH 2/2] restore macos 10.9 support ThreadPriority::Low is mapped to ThreadPriority::Background just like Linux/Windows when macOS is version 10.9 @@ -10,7 +10,7 @@ just like Linux/Windows when macOS is version 10.9 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/llvm/lib/Support/Unix/Threading.inc b/llvm/lib/Support/Unix/Threading.inc -index 819748db4ec2..2541a0ca8e5c 100644 +index 55e7dcfa4678..9d9b764c5ebf 100644 --- a/llvm/lib/Support/Unix/Threading.inc +++ b/llvm/lib/Support/Unix/Threading.inc @@ -276,19 +276,31 @@ SetThreadPriorityResult llvm::set_thread_priority(ThreadPriority Priority) { diff --git a/recipe/patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch b/recipe/patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch deleted file mode 100644 index 97ed07e4..00000000 --- a/recipe/patches/0003-ORC-Use-EPC-bootstrap-symbols-to-communicate-eh-fram.patch +++ /dev/null @@ -1,213 +0,0 @@ -From 289e985d54469a51433d78294bcb161b7c32fefd Mon Sep 17 00:00:00 2001 -From: Lang Hames -Date: Wed, 23 Aug 2023 13:39:19 -0700 -Subject: [PATCH 3/3] [ORC] Use EPC bootstrap symbols to communicate eh-frame - registration fn addrs. - -By using bootstrap symbols to communicate these addresseses, rather than dlsym -lookups, we no longer need them to be exported from the main executable. On ELF, -where symbols aren't exported from the main executable by default, this -eliminates a common source of missing symbol errors and allows for smaller -executables (if exports from the main executable aren't otherwise needed and -can be removed). ---- - .../ExecutionEngine/Orc/EPCEHFrameRegistrar.h | 15 ++--- - .../Orc/EPCEHFrameRegistrar.cpp | 65 ++++++------------- - .../Orc/ExecutorProcessControl.cpp | 7 ++ - .../Orc/Shared/OrcRTBridge.cpp | 4 +- - .../TargetProcess/SimpleRemoteEPCServer.cpp | 6 ++ - 5 files changed, 41 insertions(+), 56 deletions(-) - -diff --git a/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h b/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h -index 9772c84b682a..182e9ed1041a 100644 ---- a/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h -+++ b/llvm/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h -@@ -33,24 +33,23 @@ public: - /// find the registration functions. If it is None then the process dylib - /// will be loaded to find the registration functions. - static Expected> -- Create(ExecutionSession &ES, -- std::optional RegistrationFunctionsDylib = std::nullopt); -+ Create(ExecutionSession &ES); - - /// Create a EPCEHFrameRegistrar with the given ExecutorProcessControl - /// object and registration/deregistration function addresses. - EPCEHFrameRegistrar(ExecutionSession &ES, -- ExecutorAddr RegisterEHFrameWrapperFnAddr, -- ExecutorAddr DeregisterEHFRameWrapperFnAddr) -- : ES(ES), RegisterEHFrameWrapperFnAddr(RegisterEHFrameWrapperFnAddr), -- DeregisterEHFrameWrapperFnAddr(DeregisterEHFRameWrapperFnAddr) {} -+ ExecutorAddr RegisterEHFrameSectionWrapper, -+ ExecutorAddr DeregisterEHFRameSectionWrapper) -+ : ES(ES), RegisterEHFrameSectionWrapper(RegisterEHFrameSectionWrapper), -+ DeregisterEHFrameSectionWrapper(DeregisterEHFRameSectionWrapper) {} - - Error registerEHFrames(ExecutorAddrRange EHFrameSection) override; - Error deregisterEHFrames(ExecutorAddrRange EHFrameSection) override; - - private: - ExecutionSession &ES; -- ExecutorAddr RegisterEHFrameWrapperFnAddr; -- ExecutorAddr DeregisterEHFrameWrapperFnAddr; -+ ExecutorAddr RegisterEHFrameSectionWrapper; -+ ExecutorAddr DeregisterEHFrameSectionWrapper; - }; - - } // end namespace orc -diff --git a/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp b/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp -index 56cd982cd5e1..49af3f3d0124 100644 ---- a/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp -+++ b/llvm/lib/ExecutionEngine/Orc/EPCEHFrameRegistrar.cpp -@@ -9,67 +9,40 @@ - #include "llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h" - - #include "llvm/ExecutionEngine/Orc/Core.h" --#include "llvm/Support/BinaryStreamWriter.h" -+#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h" - - using namespace llvm::orc::shared; - - namespace llvm { - namespace orc { - --Expected> EPCEHFrameRegistrar::Create( -- ExecutionSession &ES, -- std::optional RegistrationFunctionsDylib) { -- // FIXME: Proper mangling here -- we really need to decouple linker mangling -- // from DataLayout. -- -- // Find the addresses of the registration/deregistration functions in the -- // executor process. -- auto &EPC = ES.getExecutorProcessControl(); -- -- if (!RegistrationFunctionsDylib) { -- if (auto D = EPC.loadDylib(nullptr)) -- RegistrationFunctionsDylib = *D; -- else -- return D.takeError(); -- } -- -- std::string RegisterWrapperName, DeregisterWrapperName; -- if (EPC.getTargetTriple().isOSBinFormatMachO()) { -- RegisterWrapperName += '_'; -- DeregisterWrapperName += '_'; -- } -- RegisterWrapperName += "llvm_orc_registerEHFrameSectionWrapper"; -- DeregisterWrapperName += "llvm_orc_deregisterEHFrameSectionWrapper"; -- -- SymbolLookupSet RegistrationSymbols; -- RegistrationSymbols.add(EPC.intern(RegisterWrapperName)); -- RegistrationSymbols.add(EPC.intern(DeregisterWrapperName)); -- -- auto Result = -- EPC.lookupSymbols({{*RegistrationFunctionsDylib, RegistrationSymbols}}); -- if (!Result) -- return Result.takeError(); -- -- assert(Result->size() == 1 && "Unexpected number of dylibs in result"); -- assert((*Result)[0].size() == 2 && -- "Unexpected number of addresses in result"); -- -- auto RegisterEHFrameWrapperFnAddr = (*Result)[0][0]; -- auto DeregisterEHFrameWrapperFnAddr = (*Result)[0][1]; -- -- return std::make_unique(ES, RegisterEHFrameWrapperFnAddr, -- DeregisterEHFrameWrapperFnAddr); -+Expected> -+EPCEHFrameRegistrar::Create(ExecutionSession &ES) { -+ -+ // Lookup addresseses of the registration/deregistration functions in the -+ // bootstrap map. -+ ExecutorAddr RegisterEHFrameSectionWrapper; -+ ExecutorAddr DeregisterEHFrameSectionWrapper; -+ if (auto Err = ES.getExecutorProcessControl().getBootstrapSymbols( -+ {{RegisterEHFrameSectionWrapper, -+ rt::RegisterEHFrameSectionWrapperName}, -+ {DeregisterEHFrameSectionWrapper, -+ rt::DeregisterEHFrameSectionWrapperName}})) -+ return Err; -+ -+ return std::make_unique( -+ ES, RegisterEHFrameSectionWrapper, DeregisterEHFrameSectionWrapper); - } - - Error EPCEHFrameRegistrar::registerEHFrames(ExecutorAddrRange EHFrameSection) { - return ES.callSPSWrapper( -- RegisterEHFrameWrapperFnAddr, EHFrameSection); -+ RegisterEHFrameSectionWrapper, EHFrameSection); - } - - Error EPCEHFrameRegistrar::deregisterEHFrames( - ExecutorAddrRange EHFrameSection) { - return ES.callSPSWrapper( -- DeregisterEHFrameWrapperFnAddr, EHFrameSection); -+ DeregisterEHFrameSectionWrapper, EHFrameSection); - } - - } // end namespace orc -diff --git a/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp b/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp -index b8b013f8a7a9..fc928f2e6146 100644 ---- a/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp -+++ b/llvm/lib/ExecutionEngine/Orc/ExecutorProcessControl.cpp -@@ -9,6 +9,8 @@ - #include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h" - - #include "llvm/ExecutionEngine/Orc/Core.h" -+#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h" -+#include "llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h" - #include "llvm/ExecutionEngine/Orc/TargetProcess/TargetExecutionUtils.h" - #include "llvm/Support/FormatVariadic.h" - #include "llvm/Support/Process.h" -@@ -42,6 +44,11 @@ SelfExecutorProcessControl::SelfExecutorProcessControl( - ExecutorAddr::fromPtr(this)}; - if (this->TargetTriple.isOSBinFormatMachO()) - GlobalManglingPrefix = '_'; -+ -+ this->BootstrapSymbols[rt::RegisterEHFrameSectionWrapperName] = -+ ExecutorAddr::fromPtr(&llvm_orc_registerEHFrameSectionWrapper); -+ this->BootstrapSymbols[rt::DeregisterEHFrameSectionWrapperName] = -+ ExecutorAddr::fromPtr(&llvm_orc_deregisterEHFrameSectionWrapper); - } - - Expected> -diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp b/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp -index 86e31c52100e..ae39b1d1bfaa 100644 ---- a/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp -+++ b/llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp -@@ -51,9 +51,9 @@ const char *MemoryWriteBuffersWrapperName = - "__llvm_orc_bootstrap_mem_write_buffers_wrapper"; - - const char *RegisterEHFrameSectionWrapperName = -- "__llvm_orc_bootstrap_register_ehframe_section_wrapper"; -+ "llvm_orc_registerEHFrameSectionWrapper"; - const char *DeregisterEHFrameSectionWrapperName = -- "__llvm_orc_bootstrap_deregister_ehframe_section_wrapper"; -+ "llvm_orc_deregisterEHFrameSectionWrapper"; - - const char *RunAsMainWrapperName = "__llvm_orc_bootstrap_run_as_main_wrapper"; - const char *RunAsVoidFunctionWrapperName = -diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp -index 67bc379f9821..a585767bf474 100644 ---- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp -+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp -@@ -8,7 +8,9 @@ - - #include "llvm/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.h" - -+#include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h" - #include "llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h" -+#include "llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h" - #include "llvm/Support/FormatVariadic.h" - #include "llvm/Support/Process.h" - #include "llvm/TargetParser/Host.h" -@@ -206,6 +208,10 @@ Error SimpleRemoteEPCServer::sendSetupMessage( - "Dispatch function name should not be set"); - EI.BootstrapSymbols[ExecutorSessionObjectName] = ExecutorAddr::fromPtr(this); - EI.BootstrapSymbols[DispatchFnName] = ExecutorAddr::fromPtr(jitDispatchEntry); -+ EI.BootstrapSymbols[rt::RegisterEHFrameSectionWrapperName] = -+ ExecutorAddr::fromPtr(&llvm_orc_registerEHFrameSectionWrapper); -+ EI.BootstrapSymbols[rt::DeregisterEHFrameSectionWrapperName] = -+ ExecutorAddr::fromPtr(&llvm_orc_deregisterEHFrameSectionWrapper); - - using SPSSerialize = - shared::SPSArgList; From 78e5f407356c3aa827aff32e1c85067351b19b5d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 30 Jan 2024 10:35:45 +0100 Subject: [PATCH 29/30] in jinja-computation for suffix, compare as strings, not ints --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d1189998..a5dd0401 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,7 @@ {% set major_ver = version.split(".")[0] %} # as of LLVM 17, we expect an "rc" suffix for the release candidates -{% set extra = "rc" if version.split(".")[-1]|int not in range(7) else "" %} +{% set extra = "rc" if version.split(".")[-1] not in "1234567" else "" %} {% set extra = "git" if version.split(".")[-1] == "dev0" else extra %} package: From c1cc389655d3dfe167ec7523a4c0983d01d5359d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 30 Jan 2024 10:38:28 +0100 Subject: [PATCH 30/30] fix some indentation damage by the bot --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a5dd0401..5bd58a3c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,7 +41,7 @@ requirements: outputs: # Contains everything - name: llvmdev - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: activate_in_script: true @@ -95,7 +95,7 @@ outputs: script: install_llvm.sh # [not win] build: activate_in_script: true - run_exports: # [not win] + run_exports: # [not win] - {{ pin_subpackage("libllvm" + major_ver, max_pin="x.x") }} # [not win] requirements: build: @@ -120,7 +120,7 @@ outputs: # for run_exports - name: llvm build: - run_exports: # [not win] + run_exports: # [not win] - {{ pin_subpackage("libllvm" + major_ver, max_pin="x.x") }} # [not win] requirements: build: @@ -129,7 +129,7 @@ outputs: - libxml2 - zlib - zstd - run: # [not win] + run: # [not win] - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} # [not win] run_constrained: - llvmdev {{ version }} @@ -142,7 +142,7 @@ outputs: # Contains LLVM tools - name: llvm-tools - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: activate_in_script: true @@ -174,7 +174,7 @@ outputs: # Contains LLVM-C shared library - name: libllvm-c{{ major_ver }} - script: install_llvm.sh # [unix] + script: install_llvm.sh # [unix] script: install_llvm.bat # [win] build: run_exports: