Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compiler-rt 17.0.2 #85

Merged
merged 24 commits into from
Oct 6, 2023
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
0211cc5
Merge remote-tracking branch 'upstream/main' into rc
h-vetinari Jul 21, 2023
a005681
Revert "remove rc-channels"
h-vetinari Jul 21, 2023
293b14a
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and co…
h-vetinari Jul 21, 2023
4be1917
build from upstream main branch
h-vetinari Jul 21, 2023
864271b
fix prod_ver vs. dev0
h-vetinari Jul 24, 2023
cb32b90
Merge pull request #77 from h-vetinari/rc
h-vetinari Jul 24, 2023
49fafa4
retrigger CI
h-vetinari Jul 24, 2023
bcba08f
compiler-rt 17.0.0.rc1
h-vetinari Jul 30, 2023
4ec0d42
compiler-rt 17.0.0.rc1 (#78)
github-actions[bot] Jul 30, 2023
fbac337
fix install-path on windows
h-vetinari Jul 31, 2023
e94a48d
clarify the windows setup a bit
h-vetinari Jul 31, 2023
5b8015d
Merge pull request #79 from h-vetinari/rc
h-vetinari Jul 31, 2023
fb64440
ensure bld.bat works for both RC & GA versions
h-vetinari Jul 31, 2023
b393d1e
compiler-rt 17.0.0.rc2
h-vetinari Aug 11, 2023
be7e3cd
compiler-rt 17.0.0.rc2 (#80)
github-actions[bot] Aug 11, 2023
87eb908
compiler-rt 17.0.0.rc3
h-vetinari Aug 23, 2023
d274e83
Merge pull request #82 from h-vetinari/rc
h-vetinari Aug 23, 2023
e8a8fe2
Merge remote-tracking branch 'upstream/rc'
h-vetinari Sep 26, 2023
6b40832
remove rc-channel sources & targets
h-vetinari Sep 26, 2023
76e9371
update abi_migration_branches
h-vetinari Sep 26, 2023
6a5bea9
remove flexible channel-priority
h-vetinari Sep 26, 2023
481e1ad
compiler-rt 17.0.1
h-vetinari Sep 26, 2023
ec50902
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.2, and co…
h-vetinari Sep 26, 2023
3ce862c
updated v17.0.2
regro-cf-autotick-bot Oct 3, 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
5 changes: 0 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

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

53 changes: 8 additions & 45 deletions .azure-pipelines/azure-pipelines-win.yml

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

7 changes: 0 additions & 7 deletions .ci_support/migrations/libxml2211.yaml

This file was deleted.

9 changes: 4 additions & 5 deletions .scripts/build_steps.sh

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

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

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

10 changes: 5 additions & 5 deletions .scripts/run_osx_build.sh

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

112 changes: 112 additions & 0 deletions .scripts/run_win_build.bat

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

3 changes: 1 addition & 2 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
bot:
abi_migration_branches:
- 16.x
- 15.x
- 14.x
build_platform:
osx_arm64: osx_64
channel_priority: flexible
conda_build:
pkg_format: '2'
conda_forge_output_validation: true
Expand Down
11 changes: 11 additions & 0 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
mkdir build
cd build

:: strip off ".rcX" suffixes, which are not part of the installation path
set PKG_VERSION=%PKG_VERSION:.rc1=%
set PKG_VERSION=%PKG_VERSION:.rc2=%
set PKG_VERSION=%PKG_VERSION:.rc3=%
set PKG_VERSION=%PKG_VERSION:.rc4=%
set PKG_VERSION=%PKG_VERSION:.rc5=%

set BUILD_CONFIG=Release
set "CC=clang-cl.exe"
set "CXX=clang-cl.exe"
Expand All @@ -27,5 +34,9 @@ if %ERRORLEVEL% neq 0 exit 1
cmake --install .
if %ERRORLEVEL% neq 0 exit 1

:: Also install into %PREFIX%\lib (!= %PREFIX%\Library\lib, the default on win)
:: because compiler-rt_win-64 is noarch and needs to be installable on linux,
:: where we don't want the "\Library"; aside from removing that directory,
:: the paths are the same. Separation into proper outputs happens in the recipe.
mkdir %PREFIX%\lib\clang\%PKG_VERSION%\lib\windows
copy %INSTALL_PREFIX%\lib\windows\* %PREFIX%\lib\clang\%PKG_VERSION%\lib\windows\
24 changes: 15 additions & 9 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{% set version = "16.0.6" %}
{% set prod_ver = '.'.join(version.split('.')[:3]) %}
{% set version = "17.0.2" %}
# suffixes .rc1, .rc2, etc. are removed (on unix), while .dev0 is not.
{% set prod_ver = '.'.join(version.split('.')[:3]) if version.split(".")[-1] != "dev0" else version %}

package:
name: compiler-rt-packages
version: {{ version }}

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: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e
sha256: 351562b14d42fcefcbf00cc1f327680a1062bbbf67a1e1ca6acb64c473b06394
patches:
- patches/0001-no-code-sign.patch
- patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch
Expand Down Expand Up @@ -46,11 +47,14 @@ outputs:
run_constrained:
- compiler-rt {{ version }}
files:
- lib/clang/{{ prod_ver }}/lib
- lib/clang/{{ prod_ver }}/lib # [unix]
# avoid "Library\" for noarch output
- lib\clang\{{ prod_ver }}\lib # [win]
test:
commands:
- echo {{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}
- test -f $PREFIX/lib/clang/{{ prod_ver }}/lib/darwin/libclang_rt.osx.a # [osx]
- test -f $PREFIX/lib/clang/{{ prod_ver }}/lib/darwin/libclang_rt.osx.a # [osx]
- if not exist %PREFIX%\lib\clang\{{ prod_ver }}\lib\windows\clang_rt.builtins-x86_64.lib exit 1 # [win]

- name: compiler-rt
requirements:
Expand All @@ -64,17 +68,19 @@ outputs:
files:
- lib/clang/{{ prod_ver }}/share # [unix]
- lib/clang/{{ prod_ver }}/include # [unix]
- Library/lib/clang/{{ version }}/share # [win]
- Library/lib/clang/{{ version }}/include # [win]
- Library/lib/clang/{{ version }}/lib # [win]
# standard windows layout for arch-specific output
- Library\lib\clang\{{ prod_ver }}\share # [win]
- Library\lib\clang\{{ prod_ver }}\include # [win]
- Library\lib\clang\{{ prod_ver }}\lib # [win]
test:
# files:
# - test.c.in
commands:
# {% set NEW_TARGET="10." ~ (((MACOSX_DEPLOYMENT_TARGET|default("10.13")).split(".")[1])|int + 1) %}
# - sed "s/@MACOSX_DEPLOYMENT_TARGET@/{{ NEW_TARGET }}/g" test.c.in > test.c
# - clang -mmacosx-version-min={{ MACOSX_DEPLOYMENT_TARGET }} test.c # [osx]
- test -f $PREFIX/lib/clang/{{ prod_ver }}/include/sanitizer/asan_interface.h # [unix]
- test -f $PREFIX/lib/clang/{{ prod_ver }}/include/sanitizer/asan_interface.h # [unix]
- if not exist %LIBRARY_LIB%\clang\{{ prod_ver }}\lib\windows\clang_rt.builtins-x86_64.lib exit 1 # [win]

about:
home: http://llvm.org/
Expand Down