Skip to content

Commit

Permalink
Merge pull request #315 from h-vetinari/devel
Browse files Browse the repository at this point in the history 
add missing pin to libcxx-devel; fix libcxx run-export
  • Loading branch information
@h-vetinari
h-vetinari authored Sep 4, 2024
2 parents 878ed6a + 529eddd commit 8119774
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set version = "18.1.8" %}
{% set major_version = version.split(".")[0] %}
{% set build_number = 3 %}
{% set build_number = 4 %}

# 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 @@ -87,8 +87,8 @@ outputs:
- {{ pin_subpackage("clang-tools", exact=True) }}
- {{ pin_subpackage("libclang", exact=True) }}
- {{ pin_subpackage("libclang-cpp", exact=True) }}
# Use the same requirements as the top-level requirements
- libcxx-devel {{ cxx_compiler_version }} # [osx]
# unpinned because we depend on clangxx here, which pins libcxx-devel
- libcxx-devel # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
Expand All @@ -101,7 +101,7 @@ outputs:
- {{ pin_subpackage("libclang-cpp", exact=True) }}
- llvmdev =={{ version }}
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
- libcxx >={{ version }} # [osx]
test:
requires:
- {{ compiler('cxx') }}
Expand Down Expand Up @@ -165,7 +165,7 @@ outputs:
- zstd
run:
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
- libcxx >={{ version }} # [osx]
test:
commands:
# presence of versioned library
Expand Down Expand Up @@ -213,7 +213,7 @@ outputs:
run:
- {{ 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]
- libcxx >={{ version }} # [osx]
test:
commands:
# presence on unix
Expand Down Expand Up @@ -262,7 +262,7 @@ outputs:
- zstd
run:
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
- libcxx >={{ version }} # [osx]
test:
commands:
# presence of versioned libraries
Expand Down Expand Up @@ -329,7 +329,7 @@ outputs:
run:
- {{ 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]
- libcxx >={{ version }} # [osx]
test:
commands:
- test -f $PREFIX/lib/libclang.so # [linux]
Expand Down Expand Up @@ -373,7 +373,7 @@ outputs:
run:
- {{ 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]
- libcxx >={{ version }} # [osx]
test:
commands:
# presence of versioned libraries
Expand Down Expand Up @@ -461,7 +461,7 @@ outputs:
- zstd
run:
- libstdcxx-devel_{{ target_platform }} # [linux]
- libcxx-devel # [osx]
- libcxx-devel {{ version }} # [osx]
- {{ pin_subpackage("clang", exact=True) }}
test:
requires:
Expand Down Expand Up @@ -509,16 +509,16 @@ outputs:
- {{ pin_subpackage("libclang", exact=True) }}
- {{ pin_subpackage("libclang-cpp", exact=True) }}
- llvm =={{ version }}
# Use the same requirements as the top-level requirements
- libcxx-devel {{ cxx_compiler_version }} # [osx]
# unpinned because we depend on clangxx here, which pins libcxx-devel
- libcxx-devel # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
- zstd
run:
- {{ 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]
- libcxx >={{ version }} # [osx]
test:
commands:
- clang-format-{{ major_version }} --version
Expand Down Expand Up @@ -557,8 +557,8 @@ outputs:
- {{ pin_subpackage("libclang-cpp", exact=True) }}
- {{ pin_subpackage("clang-format-" ~ major_version, exact=True) }} # [unix]
- llvm =={{ version }}
# Use the same requirements as the top-level requirements
- libcxx-devel {{ cxx_compiler_version }} # [osx]
# unpinned because we depend on clangxx here, which pins libcxx-devel
- libcxx-devel # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
Expand All @@ -567,7 +567,7 @@ outputs:
- {{ 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]
- libcxx >={{ version }} # [osx]
test:
commands:
- clang-format --version
Expand Down Expand Up @@ -602,8 +602,8 @@ outputs:
- {{ pin_subpackage("libclang-cpp", exact=True) }}
- {{ pin_subpackage("clang-format", exact=True) }}
- llvm =={{ version }}
# Use the same requirements as the top-level requirements
- libcxx-devel {{ cxx_compiler_version }} # [osx]
# unpinned because we depend on clangxx here, which pins libcxx-devel
- libcxx-devel # [osx]
- llvmdev =={{ version }}
- libxml2
- zlib
Expand All @@ -614,7 +614,7 @@ outputs:
- {{ 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]
- libcxx >={{ version }} # [osx]
run_constrained:
- clangdev {{ version }}
test:
Expand Down

0 comments on commit 8119774

Please sign in to comment.