forked from conan-io/conan-center-index
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'llvm-core-18.1' into dev
- Loading branch information
Showing
5 changed files
with
208 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| name: Conan build | ||
| on: [push] | ||
|
|
||
| defaults: | ||
| run: | ||
| shell: bash | ||
| working-directory: recipes/llvm-core/all | ||
|
|
||
| env: | ||
| LLVM_VERSION: 18.1.5 | ||
| LLVM_OPTIONS: >- | ||
| -o "llvm-core/*:with_target_amdgpu=False" | ||
| -o "llvm-core/*:with_target_arm=False" | ||
| -o "llvm-core/*:with_target_avr=False" | ||
| -o "llvm-core/*:with_target_bpf=False" | ||
| -o "llvm-core/*:with_target_hexagon=False" | ||
| -o "llvm-core/*:with_target_lanai=False" | ||
| -o "llvm-core/*:with_target_loongarch=False" | ||
| -o "llvm-core/*:with_target_mips=False" | ||
| -o "llvm-core/*:with_target_msp430=False" | ||
| -o "llvm-core/*:with_target_nvptx=False" | ||
| -o "llvm-core/*:with_target_powerpc=False" | ||
| -o "llvm-core/*:with_target_riscv=False" | ||
| -o "llvm-core/*:with_target_sparc=False" | ||
| -o "llvm-core/*:with_target_systemz=False" | ||
| -o "llvm-core/*:with_target_ve=False" | ||
| -o "llvm-core/*:with_target_xcore=False" | ||
| -o "llvm-core/*:with_target_webassembly=False" | ||
| CONAN_SETTINGS: -s compiler.cppstd=17 | ||
|
|
||
| jobs: | ||
| build: | ||
| name: ${{ matrix.runner-os }} | ||
|
|
||
| strategy: | ||
| matrix: | ||
| runner-os: [macos-14, windows-latest, ubuntu-22.04] | ||
|
|
||
| runs-on: ${{ matrix.runner-os }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: 3.12 | ||
|
|
||
| - name: install conan | ||
| run: | | ||
| pip install conan | ||
| conan profile detect | ||
| - name: create package | ||
| run: | | ||
| conan create . \ | ||
| --version ${{ env.LLVM_VERSION }} \ | ||
| ${{ env.LLVM_OPTIONS }} \ | ||
| ${{ env.CONAN_SETTINGS }} \ | ||
| --build=missing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
recipes/llvm-core/all/patches/18x/0000-cmake-dependencies.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake | ||
| index bf1b110245b..f3f59734870 100644 | ||
| --- a/cmake/config-ix.cmake | ||
| +++ b/cmake/config-ix.cmake | ||
| @@ -137,7 +137,7 @@ if(LLVM_ENABLE_ZLIB) | ||
| # library on a 64-bit system which would result in a link-time failure. | ||
| cmake_push_check_state() | ||
| list(APPEND CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIRS}) | ||
| - list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARY}) | ||
| + list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES}) | ||
| check_symbol_exists(compress2 zlib.h HAVE_ZLIB) | ||
| cmake_pop_check_state() | ||
| if(LLVM_ENABLE_ZLIB STREQUAL FORCE_ON AND NOT HAVE_ZLIB) | ||
| @@ -232,11 +232,11 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*") | ||
| # Skip libedit if using ASan as it contains memory leaks. | ||
| if (LLVM_ENABLE_LIBEDIT AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*") | ||
| if(LLVM_ENABLE_LIBEDIT STREQUAL FORCE_ON) | ||
| - find_package(LibEdit REQUIRED) | ||
| + find_package(editline REQUIRED) | ||
| else() | ||
| - find_package(LibEdit) | ||
| + find_package(editline) | ||
| endif() | ||
| - set(HAVE_LIBEDIT "${LibEdit_FOUND}") | ||
| + set(HAVE_LIBEDIT "${editline_FOUND}") | ||
| else() | ||
| set(HAVE_LIBEDIT 0) | ||
| endif() | ||
| diff --git a/lib/LineEditor/CMakeLists.txt b/lib/LineEditor/CMakeLists.txt | ||
| index c4cd91cbb0c..b95d073d972 100644 | ||
| --- a/lib/LineEditor/CMakeLists.txt | ||
| +++ b/lib/LineEditor/CMakeLists.txt | ||
| @@ -1,5 +1,5 @@ | ||
| if(HAVE_LIBEDIT) | ||
| - set(link_libs LibEdit::LibEdit) | ||
| + set(link_libs editline::editline) | ||
| endif() | ||
|
|
||
| add_llvm_component_library(LLVMLineEditor | ||
| diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt | ||
| index e19223fdef4..f2590479c84 100644 | ||
| --- a/lib/Support/CMakeLists.txt | ||
| +++ b/lib/Support/CMakeLists.txt | ||
| @@ -297,27 +297,13 @@ set(llvm_system_libs ${system_libs}) | ||
| # This block is only needed for llvm-config. When we deprecate llvm-config and | ||
| # move to using CMake export, this block can be removed. | ||
| if(LLVM_ENABLE_ZLIB) | ||
| - # CMAKE_BUILD_TYPE is only meaningful to single-configuration generators. | ||
| - if(CMAKE_BUILD_TYPE) | ||
| - string(TOUPPER ${CMAKE_BUILD_TYPE} build_type) | ||
| - get_property(zlib_library TARGET ZLIB::ZLIB PROPERTY LOCATION_${build_type}) | ||
| - endif() | ||
| - if(NOT zlib_library) | ||
| - get_property(zlib_library TARGET ZLIB::ZLIB PROPERTY LOCATION) | ||
| - endif() | ||
| + set(zlib_library ${ZLIB_LIBRARIES}) | ||
| get_library_name(${zlib_library} zlib_library) | ||
| set(llvm_system_libs ${llvm_system_libs} "${zlib_library}") | ||
| endif() | ||
|
|
||
| if(LLVM_ENABLE_ZSTD) | ||
| - # CMAKE_BUILD_TYPE is only meaningful to single-configuration generators. | ||
| - if(CMAKE_BUILD_TYPE) | ||
| - string(TOUPPER ${CMAKE_BUILD_TYPE} build_type) | ||
| - get_property(zstd_library TARGET ${zstd_target} PROPERTY LOCATION_${build_type}) | ||
| - endif() | ||
| - if(NOT zstd_library) | ||
| - get_property(zstd_library TARGET ${zstd_target} PROPERTY LOCATION) | ||
| - endif() | ||
| + set(zstd_library ${zstd_LIBRARIES}) | ||
| get_library_name(${zstd_library} zstd_library) | ||
| set(llvm_system_libs ${llvm_system_libs} "${zstd_library}") | ||
| endif() | ||
| diff --git a/lib/WindowsManifest/CMakeLists.txt b/lib/WindowsManifest/CMakeLists.txt | ||
| index 910132a4c7d..f4d91c9d56d 100644 | ||
| --- a/lib/WindowsManifest/CMakeLists.txt | ||
| +++ b/lib/WindowsManifest/CMakeLists.txt | ||
| @@ -21,14 +21,7 @@ add_llvm_component_library(LLVMWindowsManifest | ||
| # This block is only needed for llvm-config. When we deprecate llvm-config and | ||
| # move to using CMake export, this block can be removed. | ||
| if(LLVM_ENABLE_LIBXML2) | ||
| - # CMAKE_BUILD_TYPE is only meaningful to single-configuration generators. | ||
| - if(CMAKE_BUILD_TYPE) | ||
| - string(TOUPPER ${CMAKE_BUILD_TYPE} build_type) | ||
| - get_property(libxml2_library TARGET LibXml2::LibXml2 PROPERTY LOCATION_${build_type}) | ||
| - endif() | ||
| - if(NOT libxml2_library) | ||
| - get_property(libxml2_library TARGET LibXml2::LibXml2 PROPERTY LOCATION) | ||
| - endif() | ||
| + set(libxml2_library ${libxml2_LIBRARIES}) | ||
| get_library_name(${libxml2_library} libxml2_library) | ||
| set_property(TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS ${libxml2_library}) | ||
| endif() |
Oops, something went wrong.