Skip to content

GH-47833: [C++] Add utf8proc option to Meson configuration #47834

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+49 −4
Open

GH-47833: [C++] Add utf8proc option to Meson configuration #47834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions cpp/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ needs_tests = get_option('tests').enabled()
needs_acero = get_option('acero').enabled() or needs_dataset
needs_compute = get_option('compute').enabled() or needs_acero
needs_flight = get_option('flight').enabled()
needs_gandiva = false
needs_ipc = (get_option('ipc').enabled()
or needs_tests
or needs_acero
Expand Down Expand Up @@ -103,6 +104,7 @@ needs_brotli = get_option('brotli').enabled() or needs_fuzzing
needs_bz2 = get_option('bz2').enabled()
needs_lz4 = get_option('lz4').enabled()
needs_snappy = get_option('snappy').enabled()
needs_utf8proc = get_option('utf8proc').enabled() or needs_gandiva
needs_zlib = get_option('zlib').enabled()
needs_zstd = get_option('zstd').enabled()
needs_utilities = get_option('utilities').enabled()
Expand Down
9 changes: 8 additions & 1 deletion cpp/meson.options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,14 @@ option(
type: 'feature',
description: 'Build the Arrow googletest unit tests',
)

option(
'utf8proc',
type: 'feature',
description: '''
Build with support for Unicode properties using the utf8proc library;
(only used if compute or gandiva is enabled)''',
value: 'enabled',
)
option(
'utilities',
type: 'feature',
Expand Down
10 changes: 8 additions & 2 deletions cpp/src/arrow/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,12 @@ arrow_dep = declare_dependency(
meson.override_dependency('arrow', arrow_dep)

if needs_compute
arrow_compute_deps = []
if needs_utf8proc
utf8proc_dep = dependency('libutf8proc')
arrow_compute_deps += [utf8proc_dep]
endif

arrow_compute_lib_sources = [
'compute/initialize.cc',
'compute/kernels/aggregate_basic.cc',
Expand Down Expand Up @@ -551,15 +557,15 @@ if needs_compute
arrow_compute_lib = library(
'arrow-compute',
sources: arrow_compute_lib_sources,
dependencies: arrow_dep,
dependencies: [arrow_dep, arrow_compute_deps],
install: true,
gnu_symbol_visibility: 'inlineshidden',
cpp_shared_args: ['-DARROW_COMPUTE_EXPORTING'],
)
arrow_compute_dep = declare_dependency(
link_with: arrow_compute_lib,
include_directories: include_dir,
dependencies: arrow_dep,
dependencies: [arrow_dep, arrow_compute_deps],
)
meson.override_dependency('arrow-compute', arrow_compute_dep)
else
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ conf_data.set('ARROW_WITH_OPENTELEMETRY', false)
conf_data.set('ARROW_WITH_RE2', false)
conf_data.set('ARROW_WITH_SNAPPY', needs_snappy)
conf_data.set('ARROW_WITH_UCX', false)
conf_data.set('ARROW_WITH_UTF8PROC', false)
conf_data.set('ARROW_WITH_UTF8PROC', needs_utf8proc)
conf_data.set('ARROW_WITH_ZLIB', needs_zlib)
conf_data.set('ARROW_WITH_ZSTD', needs_zstd)
conf_data.set('PARQUET_REQUIRE_ENCRYPTION', needs_parquet_encryption)
Expand Down
30 changes: 30 additions & 0 deletions cpp/subprojects/utf8proc.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

[wrap-file]
directory = utf8proc-2.10.0
source_url = https://github.com/JuliaStrings/utf8proc/releases/download/v2.10.0/utf8proc-2.10.0.tar.gz
source_filename = utf8proc-2.10.0.tar.gz
source_hash = 276a37dc4d1dd24d7896826a579f4439d1e5fe33603add786bb083cab802e23e
patch_filename = utf8proc_2.10.0-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/utf8proc_2.10.0-1/get_patch
patch_hash = be16c4514603e922f9636045699fe1a6f844d340b9b7c14b809e47253b06a844
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/utf8proc_2.10.0-1/utf8proc-2.10.0.tar.gz
wrapdb_version = 2.10.0-1

[provide]
libutf8proc = utf8proc_dep
Loading