-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#24044) arrow: fix recipe when arrow/*:parquet=True
* Fix recipe when arrow/*:parquet=True * Add patch description and type annotations * Set parquet=True * Do not look for static analyzers * Bugfix * Bugfix * Refactor patches * Backport fixes from upstream * Patch v17.0.0 * Woops. Forgot to apply patch to v16.1.0 * Bump deps * Bugfix * Add patch_source * Add check to ensure with_boost=True when with_thrift=True * Fix typos * Cleanups * Set ARROW_THRIFT Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es> Co-authored-by: PerseoGI <perseog@jfrog.com> * Bugfix * Bugfix --------- Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es> Co-authored-by: PerseoGI <perseog@jfrog.com>
- Loading branch information
3 people
authored
Oct 30, 2024
1 parent
f88c7e9
commit e4ffd89
Showing
11 changed files
with
649 additions
and
44 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| diff --git a/cpp/cmake_modules/FindThriftAlt.cmake b/cpp/cmake_modules/FindThriftAlt.cmake | ||
| index f3e49021d..95177c2a6 100644 | ||
| --- a/cpp/cmake_modules/FindThriftAlt.cmake | ||
| +++ b/cpp/cmake_modules/FindThriftAlt.cmake | ||
| @@ -45,22 +45,21 @@ endif() | ||
| # * https://github.com/apache/thrift/pull/2725 | ||
| # * https://github.com/apache/thrift/pull/2726 | ||
| # * https://github.com/conda-forge/thrift-cpp-feedstock/issues/68 | ||
| -if(NOT WIN32) | ||
| - set(find_package_args "") | ||
| - if(ThriftAlt_FIND_VERSION) | ||
| - list(APPEND find_package_args ${ThriftAlt_FIND_VERSION}) | ||
| - endif() | ||
| - if(ThriftAlt_FIND_QUIETLY) | ||
| - list(APPEND find_package_args QUIET) | ||
| - endif() | ||
| - find_package(Thrift ${find_package_args}) | ||
| - if(Thrift_FOUND) | ||
| - set(ThriftAlt_FOUND TRUE) | ||
| - add_executable(thrift::compiler IMPORTED) | ||
| - set_target_properties(thrift::compiler PROPERTIES IMPORTED_LOCATION | ||
| - "${THRIFT_COMPILER}") | ||
| - return() | ||
| - endif() | ||
| + | ||
| +set(find_package_args "") | ||
| +if(ThriftAlt_FIND_VERSION) | ||
| + list(APPEND find_package_args ${ThriftAlt_FIND_VERSION}) | ||
| +endif() | ||
| +if(ThriftAlt_FIND_QUIETLY) | ||
| + list(APPEND find_package_args QUIET) | ||
| +endif() | ||
| +find_package(Thrift ${find_package_args}) | ||
| +if(Thrift_FOUND) | ||
| + set(ThriftAlt_FOUND TRUE) | ||
| + add_executable(thrift::compiler IMPORTED) | ||
| + set_target_properties(thrift::compiler PROPERTIES IMPORTED_LOCATION | ||
| + "${THRIFT_COMPILER}") | ||
| + return() | ||
| endif() | ||
|
|
||
| function(extract_thrift_version) |
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,62 @@ | ||
| diff --git a/cpp/cmake_modules/FindThriftAlt.cmake b/cpp/cmake_modules/FindThriftAlt.cmake | ||
| index f3e49021d..3e63f1edf 100644 | ||
| --- a/cpp/cmake_modules/FindThriftAlt.cmake | ||
| +++ b/cpp/cmake_modules/FindThriftAlt.cmake | ||
| @@ -45,23 +45,23 @@ endif() | ||
| # * https://github.com/apache/thrift/pull/2725 | ||
| # * https://github.com/apache/thrift/pull/2726 | ||
| # * https://github.com/conda-forge/thrift-cpp-feedstock/issues/68 | ||
| -if(NOT WIN32) | ||
| - set(find_package_args "") | ||
| - if(ThriftAlt_FIND_VERSION) | ||
| - list(APPEND find_package_args ${ThriftAlt_FIND_VERSION}) | ||
| - endif() | ||
| - if(ThriftAlt_FIND_QUIETLY) | ||
| - list(APPEND find_package_args QUIET) | ||
| - endif() | ||
| - find_package(Thrift ${find_package_args}) | ||
| - if(Thrift_FOUND) | ||
| - set(ThriftAlt_FOUND TRUE) | ||
| - add_executable(thrift::compiler IMPORTED) | ||
| - set_target_properties(thrift::compiler PROPERTIES IMPORTED_LOCATION | ||
| - "${THRIFT_COMPILER}") | ||
| - return() | ||
| - endif() | ||
| + | ||
| +set(find_package_args "") | ||
| +if(ThriftAlt_FIND_VERSION) | ||
| + list(APPEND find_package_args ${ThriftAlt_FIND_VERSION}) | ||
| +endif() | ||
| +if(ThriftAlt_FIND_QUIETLY) | ||
| + list(APPEND find_package_args QUIET) | ||
| endif() | ||
| +find_package(Thrift ${find_package_args}) | ||
| +if(Thrift_FOUND) | ||
| + set(ThriftAlt_FOUND TRUE) | ||
| + add_executable(thrift::compiler IMPORTED) | ||
| + set_target_properties(thrift::compiler PROPERTIES IMPORTED_LOCATION | ||
| + "${THRIFT_COMPILER}") | ||
| + return() | ||
| +endif() | ||
| + | ||
|
|
||
| function(extract_thrift_version) | ||
| if(ThriftAlt_INCLUDE_DIR) | ||
| diff --git a/cpp/src/parquet/CMakeLists.txt b/cpp/src/parquet/CMakeLists.txt | ||
| index 93f2e72d8..e00f73f7d 100644 | ||
| --- a/cpp/src/parquet/CMakeLists.txt | ||
| +++ b/cpp/src/parquet/CMakeLists.txt | ||
| @@ -262,11 +262,11 @@ if(NOT PARQUET_MINIMAL_DEPENDENCY) | ||
|
|
||
| # These are libraries that we will link privately with parquet_shared (as they | ||
| # do not need to be linked transitively by other linkers) | ||
| - list(APPEND PARQUET_SHARED_PRIVATE_LINK_LIBS thrift::thrift) | ||
| + list(APPEND PARQUET_SHARED_PRIVATE_LINK_LIBS Boost::headers thrift::thrift) | ||
|
|
||
| # Link publicly with parquet_static (because internal users need to | ||
| # transitively link all dependencies) | ||
| - list(APPEND PARQUET_STATIC_LINK_LIBS thrift::thrift) | ||
| + list(APPEND PARQUET_STATIC_LINK_LIBS Boost::headers thrift::thrift) | ||
| if(NOT THRIFT_VENDORED) | ||
| list(APPEND PARQUET_STATIC_INSTALL_INTERFACE_LIBS thrift::thrift) | ||
| endif() |
17 changes: 17 additions & 0 deletions
17
recipes/arrow/all/patches/7.0.0-0001-static-analyzers.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,17 @@ | ||
| diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt | ||
| index dff5b1a59..1189a2957 100644 | ||
| --- a/cpp/CMakeLists.txt | ||
| +++ b/cpp/CMakeLists.txt | ||
| @@ -161,11 +161,7 @@ else() | ||
| set(MSVC_TOOLCHAIN FALSE) | ||
| endif() | ||
|
|
||
| -find_package(ClangTools) | ||
| -find_package(InferTools) | ||
| -if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1" | ||
| - OR CLANG_TIDY_FOUND | ||
| - OR INFER_FOUND) | ||
| +if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1") | ||
| # Generate a Clang compile_commands.json "compilation database" file for use | ||
| # with various development tools, such as Vim's YouCompleteMe plugin. | ||
| # See http://clang.llvm.org/docs/JSONCompilationDatabase.html |
2 changes: 1 addition & 1 deletion
2
...ll/patches/7.0.0-0006-install-utils.patch → ...ll/patches/7.0.0-0002-install-utils.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
Oops, something went wrong.