Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
27d0916
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] Nov 2, 2022
15b910e
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration DotConda
conda-forge-curator[bot] Nov 17, 2022
4e24e12
Merge remote-tracking branch 'up/rc' into rc
h-vetinari Feb 8, 2023
9273e3c
Merge remote-tracking branch 'upstream/main' into rc
h-vetinari Feb 8, 2023
eef6637
Revert "remove rc-channels"
h-vetinari Feb 8, 2023
f43bb84
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and co…
h-vetinari Feb 8, 2023
54e6b26
bump to 16.0.0.rc1
h-vetinari Feb 8, 2023
6628df4
rebase patches
h-vetinari Feb 8, 2023
bf246eb
compiler-rt 16.0.0.rc1 (#59)
github-actions[bot] Feb 8, 2023
e4e3874
bump to 16.0.0.rc2
h-vetinari Feb 10, 2023
4f17bc6
bump to 16.0.0.rc2 (#60)
github-actions[bot] Feb 10, 2023
ff574e6
bump to 16.0.0.rc3
h-vetinari Feb 25, 2023
8c96e08
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and co…
h-vetinari Feb 25, 2023
99713f1
Revert "MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0…
h-vetinari Feb 25, 2023
8791fef
Merge pull request #61 from h-vetinari/rc
h-vetinari Feb 26, 2023
a13d6a5
bump to 16.0.0.rc4
h-vetinari Mar 16, 2023
84b8403
force older py-lief due to conda-build (resp. lief) bug
h-vetinari Mar 16, 2023
5926816
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and co…
h-vetinari Mar 16, 2023
2f4faa2
compiler-rt 16.0.0.rc4 (#62)
github-actions[bot] Mar 16, 2023
b22466a
updated v16.0.0
regro-cf-autotick-bot Mar 18, 2023
11abc03
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and co…
regro-cf-autotick-bot Mar 18, 2023
058048e
Merge remote-tracking branch 'upstream/rc' into 16.0.0_hb37422
h-vetinari Mar 18, 2023
8cf161c
remove rc-channels
h-vetinari Mar 18, 2023
f789bad
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and co…
h-vetinari Mar 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ github:
tooling_branch_name: main
conda_build:
pkg_format: '2'
# due to https://github.com/conda/conda-build/issues/4787
remote_ci_setup:
- conda-forge-ci-setup=3
- py-lief<0.12
5 changes: 2 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "15.0.7" %}
{% set version = "16.0.0" %}
{% set prod_ver = '.'.join(version.split('.')[:3]) %}

package:
Expand All @@ -7,11 +7,10 @@ package:

source:
url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz
sha256: 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6
sha256: 9a56d906a2c81f16f06efc493a646d497c53c2f4f28f0cb1f3c8da7f74350254
patches:
- patches/0001-no-code-sign.patch
- patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch
- patches/0003-set-cmake-paths.patch

build:
number: 0
Expand Down
10 changes: 5 additions & 5 deletions recipe/patches/0001-no-code-sign.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From 865962f756a05ac834fb269f27670c2ae82b18cb Mon Sep 17 00:00:00 2001
From 97bf8a10a839e06d50a82e151e72c5ccec7233d8 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 22 Apr 2019 02:00:30 -0500
Subject: [PATCH 1/3] no code sign
Subject: [PATCH 1/2] no code sign

---
compiler-rt/cmake/Modules/AddCompilerRT.cmake | 28 -------------------
1 file changed, 28 deletions(-)

diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index 00bb892be595..3ca2d5e9102b 100644
index 2771a4063c..73ddee3bd4 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -393,34 +393,6 @@ function(add_compiler_rt_runtime name type)
@@ -399,34 +399,6 @@ function(add_compiler_rt_runtime name type)
set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
endif()
Expand Down Expand Up @@ -47,5 +47,5 @@ index 00bb892be595..3ca2d5e9102b 100644

set(parent_target_arg)
--
2.37.0.windows.1
2.38.1.windows.1

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From c8e089d852f22bade19660afe7666421953e69c4 Mon Sep 17 00:00:00 2001
From 2c5037a75c9daf1f0b27454bd065ff3cde46c9cc Mon Sep 17 00:00:00 2001
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Tue, 16 Oct 2018 21:23:44 -0500
Subject: [PATCH 2/3] compiler-rt: Make 7.0.0 compatible with 10.9 SDK
Subject: [PATCH 2/2] compiler-rt: Make 7.0.0 compatible with 10.9 SDK

---
compiler-rt/lib/xray/xray_buffer_queue.h | 7 +++++
compiler-rt/lib/xray/xray_utils.h | 33 ++++++++++++++++++++++++
2 files changed, 40 insertions(+)

diff --git a/compiler-rt/lib/xray/xray_buffer_queue.h b/compiler-rt/lib/xray/xray_buffer_queue.h
index e1739d050f3d..38288e35ae62 100644
index e1739d050f..38288e35ae 100644
--- a/compiler-rt/lib/xray/xray_buffer_queue.h
+++ b/compiler-rt/lib/xray/xray_buffer_queue.h
@@ -21,6 +21,13 @@
Expand All @@ -27,7 +27,7 @@ index e1739d050f3d..38288e35ae62 100644

/// BufferQueue implements a circular queue of fixed sized buffers (much like a
diff --git a/compiler-rt/lib/xray/xray_utils.h b/compiler-rt/lib/xray/xray_utils.h
index 333826168c0d..637ab17f4805 100644
index 333826168c..637ab17f48 100644
--- a/compiler-rt/lib/xray/xray_utils.h
+++ b/compiler-rt/lib/xray/xray_utils.h
@@ -24,6 +24,39 @@
Expand Down Expand Up @@ -71,5 +71,5 @@ index 333826168c0d..637ab17f4805 100644

class LogWriter {
--
2.37.0.windows.1
2.38.1.windows.1

31 changes: 0 additions & 31 deletions recipe/patches/0003-set-cmake-paths.patch

This file was deleted.