Skip to content

GH-1408: Add bundled utf8_range headers to the macOS Gandiva JNI build #1409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbonofre wants to merge 2 commits into
base: main
Choose a base branch
from
Open

GH-1408: Add bundled utf8_range headers to the macOS Gandiva JNI build #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f131879
GH-1408: Add bundled utf8_range headers to the macOS Gandiva JNI build
jbonofre Oct 26, 2026
bb9f52c
Apply suggestion from @kou
jbonofre Oct 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ set(ARROW_JAVA_JNI_ABSL_INCLUDE_DIR
""
CACHE PATH "Path to Abseil source headers for the Gandiva JNI build")
mark_as_advanced(ARROW_JAVA_JNI_ABSL_INCLUDE_DIR)
set(ARROW_JAVA_JNI_UTF8_RANGE_INCLUDE_DIR
""
CACHE PATH "Path to utf8_range source headers for the Gandiva JNI build")
mark_as_advanced(ARROW_JAVA_JNI_UTF8_RANGE_INCLUDE_DIR)

include(GNUInstallDirs)

Expand Down
8 changes: 8 additions & 0 deletions ci/scripts/jni_macos_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,17 @@ if [ ! -d "${absl_include_dir}/absl" ]; then
exit 1
fi

# Protobuf 33+ headers include utf8_validity.h from the bundled utf8_range.
utf8_range_include_dir="${build_dir}/cpp/_deps/protobuf-src/third_party/utf8_range"
if [ ! -f "${utf8_range_include_dir}/utf8_validity.h" ]; then
echo "Bundled utf8_range headers were not found in ${utf8_range_include_dir}" >&2
exit 1
fi

JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/_deps/protobuf-build"
JAVA_JNI_CMAKE_ARGS+=" -DProtobuf_SRC_ROOT_FOLDER=${build_dir}/cpp/_deps/protobuf-src"
JAVA_JNI_CMAKE_ARGS+=" -DARROW_JAVA_JNI_ABSL_INCLUDE_DIR=${absl_include_dir}"
JAVA_JNI_CMAKE_ARGS+=" -DARROW_JAVA_JNI_UTF8_RANGE_INCLUDE_DIR=${utf8_range_include_dir}"
export JAVA_JNI_CMAKE_ARGS
"${source_dir}/ci/scripts/jni_build.sh" \
"${source_dir}" \
Expand Down
4 changes: 4 additions & 0 deletions gandiva/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ if(ARROW_JAVA_JNI_ABSL_INCLUDE_DIR)
target_include_directories(arrow_java_jni_gandiva SYSTEM
PRIVATE "${ARROW_JAVA_JNI_ABSL_INCLUDE_DIR}")
endif()
if(ARROW_JAVA_JNI_UTF8_RANGE_INCLUDE_DIR)
target_include_directories(arrow_java_jni_gandiva SYSTEM
PRIVATE "${ARROW_JAVA_JNI_UTF8_RANGE_INCLUDE_DIR}")
endif()
target_link_libraries(arrow_java_jni_gandiva
arrow_java_jni_gandiva_headers
jni
Expand Down
Loading