ORC-1732: [C++] Fix detecting Homebrew-installed Protobuf on MacOS #1963
Conversation
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
wgtmac
reviewed
Jun 28, 2024
|
@kou Could you help review this? Thanks! |
kou
reviewed
Jul 1, 2024
There was a problem hiding this comment.
How about adding a CI job on macOS?
https://github.com/apache/orc/compare/main...kou:orc:cpp-protobuf?expand=1#diff-48c0ee97c53013d18d6bbae44648f7fab9af2e0bf5b0dc1ca761e18ec5c478f2R101-R133 is a sample configuration.
cmake_modules/FindProtobuf.cmake
Outdated
| message(FATAL_ERROR "Cannot determine Protobuf include directory.") | ||
| endif () | ||
|
|
||
| if (Protobuf_LIBRARIES MATCHES "\\.a$") |
There was a problem hiding this comment.
We may be able to use https://cmake.org/cmake/help/latest/variable/CMAKE_STATIC_LIBRARY_SUFFIX.html instead of .a.
There was a problem hiding this comment.
Thanks for looking at that, '.a' has been replaced with CMAKE_STATIC_LIBRARY_SUFFIX
cmake_modules/FindProtobuf.cmake
Outdated
| if (NOT PROTOBUF_INCLUDE_DIR) | ||
| set (PROTOBUF_INCLUDE_DIR ${Protobuf_INCLUDE_DIRS}) | ||
| if (NOT PROTOBUF_INCLUDE_DIR) | ||
| message(FATAL_ERROR "Cannot determine Protobuf include directory.") |
There was a problem hiding this comment.
How about showing detection sources too for easy to debug?
Suggested change
| message(FATAL_ERROR "Cannot determine Protobuf include directory.") | |
| message(FATAL_ERROR "Cannot determine Protobuf include directory from protobuf::libprotobuf and Protobuf_INCLUDE_DIRS.") |
|
The new github action doesn't run. I found the error message below: https://github.com/apache/orc/actions/runs/9746489872 |
wgtmac
reviewed
Jul 3, 2024
wgtmac
reviewed
Jul 3, 2024
wgtmac
changed the title
wgtmac
changed the title
Co-authored-by: Gang Wu <ustcwg@gmail.com>
Co-authored-by: Gang Wu <ustcwg@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
.github/workflows/build_and_test.yml
Outdated
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| version: [12, 14] |
There was a problem hiding this comment.
There is no significant difference between 13 and 12 for C++ compilation.
dongjoon-hyun
pushed a commit
that referenced
this pull request
Jul 11, 2024
### What changes were proposed in this pull request? Detect Protobuf installed by Homebrew on macOS. ### Why are the changes needed? Deal with the issue discussed [here](apache/arrow#42149) ### How was this patch tested? Test it locally. ### Was this patch authored or co-authored using generative AI tooling? NO Closes #1963 from luffy-zh/ORC-1732. Lead-authored-by: luffy-zh <zhnice@outlook.com> Co-authored-by: Hao Zou <34559830+luffy-zh@users.noreply.github.com> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org> (cherry picked from commit a9e0351) Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
This was referenced Nov 15, 2024
kou
pushed a commit
to apache/arrow
that referenced
this pull request
Nov 17, 2024
### Rationale for this change This PR aims to upgrade ORC to 2.0.3 to bring the following bug fixes. - https://orc.apache.org/news/2024/08/15/ORC-2.0.2/ - apache/orc#1963 - apache/orc#1997 - apache/orc#1981 - https://orc.apache.org/news/2024/11/14/ORC-2.0.3/ - apache/orc#2055 ### What changes are included in this PR? To use the latest bug fixed version. ### Are these changes tested? This should pass the CIs. ### Are there any user-facing changes? No. * GitHub Issue: #44744 Authored-by: Dongjoon Hyun <dongjoon@apache.org> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Detect Protobuf installed by Homebrew on macOS.
Why are the changes needed?
Deal with the issue discussed here
How was this patch tested?
Test it locally.
Was this patch authored or co-authored using generative AI tooling?
NO