Skip to content

Commit da7bfcb

Browse files
committed
Re-add protobuf linkage
1 parent f52976e commit da7bfcb

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

.github/workflows/rc.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,11 @@ jobs:
259259
brew uninstall grpc || : # gRPC depends on RE2
260260
brew uninstall [email protected] || : # gRPC 1.54 may be installed too
261261
brew uninstall re2
262+
# We want to use bundled Protobuf for static linking. If
263+
# Homebrew's Protobuf is installed, its library file may be
264+
# used on test We uninstall Homebrew's Protobuf to ensure using
265+
# bundled Protobuf.
266+
brew uninstall protobuf
262267
263268
brew bundle --file=Brewfile
264269
- name: Prepare ccache

gandiva/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ set_property(TARGET arrow_java_jni_gandiva PROPERTY OUTPUT_NAME "gandiva_jni")
5757
target_link_libraries(arrow_java_jni_gandiva
5858
arrow_java_jni_gandiva_headers
5959
jni
60+
protobuf::libprotobuf
6061
Gandiva::gandiva_static)
6162

6263
# Localize thirdparty symbols using a linker version script. This hides them

0 commit comments

Comments
 (0)