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

clangdev v18.1.1 #272

Merged
merged 25 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
23d7313
Merge remote-tracking branch 'upstream/main' into rc
h-vetinari Jan 30, 2024
6b8af00
Revert "remove rc-channels"
h-vetinari Jan 30, 2024
a11232e
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
h-vetinari Jan 30, 2024
b2f681c
clangdev 18.1.0.rc1
h-vetinari Jan 30, 2024
bf3ad7b
account for new versioning scheme
h-vetinari Jan 30, 2024
7a8fc38
Re-apply "fix compiler stack on osx vs. rc-label"
h-vetinari Jan 30, 2024
3176e21
fix use of renamed member function in patch
h-vetinari Jan 31, 2024
5762c9b
during rc-phase, use newer deployment target
h-vetinari Jan 31, 2024
e09dcc4
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
h-vetinari Jan 31, 2024
7bd0460
Merge pull request #266 from h-vetinari/rc
h-vetinari Jan 31, 2024
5f21dd4
clangdev 18.1.0.rc4
h-vetinari Mar 1, 2024
3322b33
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
h-vetinari Mar 1, 2024
ca28990
update to new SOVER pattern of minor number always being there
h-vetinari Mar 2, 2024
711231e
clangdev 18.1.0.rc4 (#270)
github-actions[bot] Mar 2, 2024
c234d98
updated v18.1.0
regro-cf-autotick-bot Mar 6, 2024
d64fe4b
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
regro-cf-autotick-bot Mar 6, 2024
984264e
Merge remote-tracking branch 'upstream/rc' into 18.1.0_hd2be15
h-vetinari Mar 6, 2024
d0b2484
Revert "during rc-phase, use newer deployment target"
h-vetinari Mar 6, 2024
e4fa62e
remove rc-channels
h-vetinari Mar 6, 2024
4e983bd
Fix build string for clang with variants
chrisburr Jul 28, 2023
c5f3863
Add root variant to track_features
vepadulano Feb 2, 2024
c5b7299
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
h-vetinari Mar 6, 2024
5d1b332
Revert "Re-apply "fix compiler stack on osx vs. rc-label""
h-vetinari Mar 6, 2024
b7458f2
updated v18.1.1
regro-cf-autotick-bot Mar 9, 2024
5205357
Merge remote-tracking branch 'upstream/main' into 18.1.0_hd2be15
h-vetinari Mar 12, 2024
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
2 changes: 1 addition & 1 deletion .ci_support/linux_64_variantdefault.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ docker_image:
libclang_soversion:
- '13'
libxml2:
- '2.12'
- '2'
target_platform:
- linux-64
variant:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_variantdefault.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libclang_soversion:
- '13'
libxml2:
- '2.12'
- '2'
target_platform:
- linux-aarch64
variant:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_variantdefault.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ docker_image:
libclang_soversion:
- '13'
libxml2:
- '2.12'
- '2'
target_platform:
- linux-ppc64le
variant:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler_version:
libclang_soversion:
- '13'
libxml2:
- '2.12'
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler_version:
libclang_soversion:
- '13'
libxml2:
- '2.12'
- '2'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cxx_compiler:
libclang_soversion:
- '13'
libxml2:
- '2.12'
- '2'
target_platform:
- win-64
variant:
Expand Down
13 changes: 12 additions & 1 deletion .gitignore

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

12 changes: 3 additions & 9 deletions .scripts/build_steps.sh

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

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh

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

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.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/run_win_build.bat

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

12 changes: 6 additions & 6 deletions README.md

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

5 changes: 3 additions & 2 deletions build-locally.py

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

29 changes: 21 additions & 8 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{% set version = "17.0.6" %}
{% set version = "18.1.1" %}
{% set major_version = version.split(".")[0] %}
{% set build_number = 3 %}
{% set build_number = 0 %}

{% set minor_aware_ext = major_version %}
{% if version.split(".")[1] | int > 0 %}
# always includes minor as of v18, see https://github.com/llvm/llvm-project/issues/76273
{% set minor_aware_ext = major_version ~ "." ~ version.split(".")[1] %}
{% elif version.split(".")[-1].startswith("rc") %}
{% set minor_aware_ext = major_version ~ "rc" %}
{% if version.split(".")[-1].startswith("rc") %}
{% set minor_aware_ext = minor_aware_ext ~ "rc" %}
{% elif version.split(".")[-1] == "dev0" %}
{% set minor_aware_ext = major_version ~ "git" %}
{% set minor_aware_ext = minor_aware_ext ~ "git" %}
{% endif %}

{% if libclang_soversion is not defined %}
# see https://github.com/llvm/llvm-project/blob/release/18.x/clang/tools/libclang/CMakeLists.txt
{% set libclang_soversion = "13" %}
{% endif %}

Expand All @@ -21,7 +21,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: 8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad
patches:
- patches/0001-Fix-sysroot-detection-for-linux.patch
- patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch
Expand Down Expand Up @@ -93,6 +93,7 @@ outputs:
build:
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
ignore_run_exports_from:
# the build fails if it doesn't find the following, but it's not used
Expand Down Expand Up @@ -142,6 +143,7 @@ outputs:
skip: true # [win]
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
run_exports:
- {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix]
Expand Down Expand Up @@ -183,6 +185,7 @@ outputs:
build:
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
run_exports: # [unix]
- {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix]
Expand Down Expand Up @@ -226,6 +229,7 @@ outputs:
build:
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
run_exports:
# note that the name (e.g. libclang13) does not necessarily
Expand Down Expand Up @@ -289,6 +293,7 @@ outputs:
build:
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
run_exports:
# note that the name (e.g. libclang13) does not necessarily
Expand Down Expand Up @@ -387,6 +392,10 @@ outputs:
script: install_clang_symlinks.sh # [unix]
script: install_clang_symlinks.bat # [win]
build:
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
ignore_run_exports_from:
# the build fails if it doesn't find the following, but it's not used
- libxml2
Expand Down Expand Up @@ -418,6 +427,7 @@ outputs:
build:
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
ignore_run_exports_from:
# the build fails if it doesn't find the following, but it's not used
Expand Down Expand Up @@ -455,6 +465,7 @@ outputs:
build:
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
# for windows, use the clang-format package.
skip: true # [win]
Expand Down Expand Up @@ -501,6 +512,7 @@ outputs:
build:
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
ignore_run_exports_from:
# the build fails if it doesn't find the following, but it's not used
Expand Down Expand Up @@ -545,6 +557,7 @@ outputs:
build:
track_features:
- hcc # [variant=="hcc"]
- root # [variant and variant.startswith("root_")]
string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }}
ignore_run_exports_from:
# the build fails if it doesn't find the following, but it's not used
Expand Down
Loading
Loading