Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into rc
Browse files Browse the repository at this point in the history
  • Loading branch information
@h-vetinari
h-vetinari committed Aug 29, 2024
2 parents f1a7f0e + 878ed6a commit a8a79fb
Showing 1 changed file with 32 additions and 23 deletions.
55 changes: 32 additions & 23 deletions recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set version = "19.1.0.rc3" %}
{% set major_version = version.split(".")[0] %}
{% set build_number = 0 %}
{% set build_number = 1 %}

# always includes minor as of v18, see https://github.com/llvm/llvm-project/issues/76273
{% set minor_aware_ext = major_version ~ "." ~ version.split(".")[1] %}
Expand Down Expand Up @@ -58,7 +58,7 @@ requirements:
- zlib # [build_platform != target_platform]
- zstd # [build_platform != target_platform]
host:
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
Expand Down Expand Up @@ -92,7 +92,7 @@ outputs:
- {{ pin_subpackage("libclang", exact=True) }}
- {{ pin_subpackage("libclang-cpp", exact=True) }}
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
Expand All @@ -103,8 +103,9 @@ outputs:
- {{ pin_subpackage("clang-tools", exact=True) }}
- {{ pin_subpackage("libclang", exact=True) }}
- {{ pin_subpackage("libclang-cpp", exact=True) }}
- {{ pin_compatible("libcxx", max_pin=None) }} # [osx]
- llvmdev =={{ version }}
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
test:
requires:
- {{ compiler('cxx') }}
Expand Down Expand Up @@ -161,13 +162,14 @@ outputs:
host:
- llvm =={{ version }}
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- {{ pin_compatible("libcxx", max_pin=None) }} # [osx]
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
test:
commands:
# presence of versioned library
Expand Down Expand Up @@ -207,14 +209,15 @@ outputs:
- llvm =={{ version }}
- {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }} # [unix]
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- {{ pin_compatible("libcxx", max_pin=None) }} # [osx]
- {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }} # [unix]
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
test:
commands:
# presence on unix
Expand Down Expand Up @@ -256,13 +259,14 @@ outputs:
- llvm =={{ version }}
- {{ pin_subpackage("clang", exact=True) }}
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- {{ pin_compatible("libcxx", max_pin=None) }} # [osx]
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
test:
commands:
# presence of versioned libraries
Expand Down Expand Up @@ -321,14 +325,15 @@ outputs:
- {{ pin_subpackage("clang", exact=True) }}
- {{ pin_subpackage("libclang" ~ libclang_soversion, exact=True) }}
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- {{ pin_compatible("libcxx", max_pin=None) }} # [osx]
- {{ pin_subpackage("libclang" ~ libclang_soversion, exact=True) }}
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
test:
commands:
- test -f $PREFIX/lib/libclang.so # [linux]
Expand Down Expand Up @@ -359,20 +364,20 @@ outputs:
- cmake
- ninja # [win]
- make # [unix]
- libcxx # [osx]
- llvmdev =={{ version }} # [build_platform != target_platform]
host:
- llvm =={{ version }}
- {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }} # [unix]
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- {{ pin_compatible("libcxx", max_pin=None) }} # [osx]
- {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }} # [unix]
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
test:
commands:
# presence of versioned libraries
Expand Down Expand Up @@ -418,7 +423,7 @@ outputs:
host:
- {{ pin_subpackage("clang-" ~ major_version, exact=True) }}
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
Expand Down Expand Up @@ -461,13 +466,14 @@ outputs:
host:
- {{ pin_subpackage("clang", exact=True) }}
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- libstdcxx-devel_{{ target_platform }} # [linux]
- libcxx-devel # [osx]
- {{ pin_subpackage("clang", exact=True) }}
test:
requires:
Expand Down Expand Up @@ -516,14 +522,15 @@ outputs:
- {{ pin_subpackage("libclang-cpp", exact=True) }}
- llvm =={{ version }}
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- {{ pin_compatible("libcxx", max_pin=None) }} # [osx]
- {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix]
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
test:
commands:
- clang-format-{{ major_version }} --version
Expand Down Expand Up @@ -563,15 +570,16 @@ outputs:
- {{ pin_subpackage("clang-format-" ~ major_version, exact=True) }} # [unix]
- llvm =={{ version }}
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- {{ pin_compatible("libcxx", max_pin=None) }} # [osx]
- {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix]
- {{ pin_subpackage("clang-format-" ~ major_version, exact=True) }} # [unix]
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
test:
commands:
- clang-format --version
Expand Down Expand Up @@ -607,17 +615,18 @@ outputs:
- {{ pin_subpackage("clang-format", exact=True) }}
- llvm =={{ version }}
# Use the same requirements as the top-level requirements
- libcxx {{ cxx_compiler_version }} # [osx]
- libcxx-devel {{ cxx_compiler_version }} # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- ucrt # [win]
- {{ pin_compatible("libcxx", max_pin=None) }} # [osx]
- {{ pin_subpackage("clang-format", exact=True) }}
- {{ pin_subpackage("libclang" ~ libclang_soversion, max_pin=None) }}
- {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix]
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
run_constrained:
- clangdev {{ version }}
test:
Expand Down

0 comments on commit a8a79fb

Please sign in to comment.