This is an automated email from the ASF dual-hosted git repository.

raulcd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new c5bd9c358c GH-48115: [C++] Better align Meson configuration and 
config.h (#48116)
c5bd9c358c is described below

commit c5bd9c358cf59059e626dd52cc2ce754f71a0df2
Author: William Ayd <[email protected]>
AuthorDate: Thu Nov 13 04:56:42 2025 -0500

    GH-48115: [C++] Better align Meson configuration and config.h (#48116)
    
    ### Rationale for this change
    
    This ensures configuration settings properly match in Meson
    
    ### What changes are included in this PR?
    
    Better aligned config.h with the top level meson.build settings
    
    ### Are these changes tested?
    
    Yes
    
    ### Are there any user-facing changes?
    
    No
    * GitHub Issue: #48115
    
    Authored-by: Will Ayd <[email protected]>
    Signed-off-by: Raúl Cumplido <[email protected]>
---
 cpp/meson.build                |  4 +++-
 cpp/src/arrow/util/meson.build | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/cpp/meson.build b/cpp/meson.build
index 0fe4ccb831..ae1f391a88 100644
--- a/cpp/meson.build
+++ b/cpp/meson.build
@@ -53,6 +53,7 @@ endif
 
 needs_benchmarks = get_option('benchmarks').enabled()
 needs_csv = get_option('csv').enabled()
+needs_cuda = false
 needs_substrait = get_option('substrait').enabled()
 needs_dataset = get_option('dataset').enabled() or needs_substrait
 needs_azure = get_option('azure').enabled()
@@ -75,7 +76,8 @@ needs_integration = get_option('integration').enabled()
 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_flight_sql = false
+needs_flight = get_option('flight').enabled() or needs_flight_sql
 needs_gandiva = false
 needs_ipc = (get_option('ipc').enabled()
     or needs_tests
diff --git a/cpp/src/arrow/util/meson.build b/cpp/src/arrow/util/meson.build
index 0c49abc9b9..ccccd68d1f 100644
--- a/cpp/src/arrow/util/meson.build
+++ b/cpp/src/arrow/util/meson.build
@@ -38,25 +38,25 @@ conf_data.set('UPPERCASE_BUILD_TYPE', 
get_option('buildtype').to_upper())
 conf_data.set('ARROW_PACKAGE_KIND', get_option('package_kind'))
 
 conf_data.set('ARROW_COMPUTE', needs_compute)
-conf_data.set('ARROW_CSV', false)
-conf_data.set('ARROW_CUDA', false)
-conf_data.set('ARROW_DATASET', false)
-conf_data.set('ARROW_FILESYSTEM', false)
-conf_data.set('ARROW_FLIGHT', false)
-conf_data.set('ARROW_FLIGHT_SQL', false)
+conf_data.set('ARROW_CSV', needs_csv)
+conf_data.set('ARROW_CUDA', needs_cuda)
+conf_data.set('ARROW_DATASET', needs_dataset)
+conf_data.set('ARROW_FILESYSTEM', needs_filesystem)
+conf_data.set('ARROW_FLIGHT', needs_flight)
+conf_data.set('ARROW_FLIGHT_SQL', needs_flight_sql)
 conf_data.set('ARROW_IPC', needs_ipc)
 conf_data.set('ARROW_JEMALLOC', false)
 conf_data.set('ARROW_JEMALLOC_VENDORED', false)
 conf_data.set('ARROW_JSON', needs_json)
 conf_data.set('ARROW_MIMALLOC', false)
-conf_data.set('ARROW_ORC', false)
+conf_data.set('ARROW_ORC', needs_orc)
 conf_data.set('ARROW_PARQUET', needs_parquet)
 conf_data.set('ARROW_SUBSTRAIT', needs_substrait)
-conf_data.set('ARROW_AZURE', false)
+conf_data.set('ARROW_AZURE', needs_azure)
 conf_data.set('ARROW_ENABLE_THREADING', true)
 conf_data.set('ARROW_GCS', needs_gcs)
-conf_data.set('ARROW_HDFS', false)
-conf_data.set('ARROW_S3', false)
+conf_data.set('ARROW_HDFS', needs_hdfs)
+conf_data.set('ARROW_S3', needs_s3)
 conf_data.set('ARROW_USE_GLOG', false)
 
 has_int128 = cpp_compiler.has_define('__SIZEOF_INT128__')
@@ -66,7 +66,7 @@ conf_data.set('ARROW_WITH_BROTLI', needs_brotli)
 conf_data.set('ARROW_WITH_BZ2', needs_bz2)
 conf_data.set('ARROW_WITH_LZ4', needs_lz4)
 conf_data.set('ARROW_WITH_MUSL', false)
-conf_data.set('ARROW_WITH_OPENTELEMETRY', false)
+conf_data.set('ARROW_WITH_OPENTELEMETRY', needs_opentelemetry)
 conf_data.set('ARROW_WITH_RE2', false)
 conf_data.set('ARROW_WITH_SNAPPY', needs_snappy)
 conf_data.set('ARROW_WITH_UCX', false)

Reply via email to