Skip to content

Commit f7d7f58

Browse files
committed
Add the new S3 library to R configure and configure.win and to C GLib
and Ruby builds
1 parent bf162b6 commit f7d7f58

4 files changed

Lines changed: 28 additions & 3 deletions

File tree

c_glib/arrow-glib/meson.build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@ if not gio.found()
225225
gio = dependency('gio-2.0')
226226
endif
227227
dependencies = [arrow_acero, arrow_compute, arrow, gobject, gio]
228+
if arrow_s3.found()
229+
dependencies += arrow_s3
230+
endif
228231
libarrow_glib = library(
229232
'arrow-glib',
230233
sources: sources + enums,

c_glib/meson.build

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,13 @@ if arrow_cpp_build_lib_dir == ''
165165
modules: ['ArrowDataset::arrow_dataset_shared'],
166166
required: false,
167167
)
168+
arrow_s3 = dependency(
169+
'arrow-s3',
170+
'ArrowS3',
171+
kwargs: common_args,
172+
modules: ['ArrowS3::arrow_s3_shared'],
173+
required: false,
174+
)
168175
arrow_flight = dependency(
169176
'arrow-flight',
170177
'ArrowFlight',
@@ -235,6 +242,11 @@ main(void)
235242
dirs: [arrow_cpp_build_lib_dir],
236243
required: false,
237244
)
245+
arrow_s3 = cpp_compiler.find_library(
246+
'arrow_s3',
247+
dirs: [arrow_cpp_build_lib_dir],
248+
required: false,
249+
)
238250
arrow_flight = cpp_compiler.find_library(
239251
'arrow_flight',
240252
dirs: [arrow_cpp_build_lib_dir],

r/configure

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@ add_feature_flags () {
358358
fi
359359
if arrow_built_with ARROW_S3; then
360360
PKG_CFLAGS_FEATURES="$PKG_CFLAGS_FEATURES -DARROW_R_WITH_S3"
361+
PKG_CONFIG_NAMES_FEATURES="$PKG_CONFIG_NAMES_FEATURES arrow-s3"
362+
PKG_LIBS_FEATURES_WITHOUT_PC="-larrow_s3 $PKG_LIBS_FEATURES_WITHOUT_PC"
363+
# NOTE: arrow_s3 is assumed to have the same -L flag as arrow
364+
# so there is no need to add its location to PKG_DIRS
361365
fi
362366
if arrow_built_with ARROW_GCS; then
363367
PKG_CFLAGS_FEATURES="$PKG_CFLAGS_FEATURES -DARROW_R_WITH_GCS"

r/configure.win

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,13 @@ function configure_binaries() {
8282
# NOTE: If you make changes to the libraries below, you should also change
8383
# ci/scripts/r_windows_build.sh and ci/scripts/PKGBUILD
8484
PKG_CFLAGS="-I${RWINLIB}/include -DARROW_STATIC -DARROW_COMPUTE_STATIC -DPARQUET_STATIC \
85-
-DARROW_DS_STATIC -DARROW_ACERO_STATIC -DARROW_R_WITH_PARQUET \
85+
-DARROW_DS_STATIC -DARROW_ACERO_STATIC -DARROW_R_WITH_PARQUET -DARROW_S3_STATIC \
8686
-DARROW_R_WITH_COMPUTE -DARROW_R_WITH_ACERO \
87-
-DARROW_R_WITH_DATASET -DARROW_R_WITH_JSON"
87+
-DARROW_R_WITH_DATASET -DARROW_R_WITH_JSON \
88+
-DARROW_R_WITH_S3"
8889
PKG_LIBS="-L${RWINLIB}/lib"'$(subst gcc,,$(COMPILED_BY))$(R_ARCH) '
8990
PKG_LIBS="$PKG_LIBS -L${RWINLIB}/lib"'$(R_ARCH)$(CRT) '
90-
PKG_LIBS="$PKG_LIBS -larrow_dataset -larrow_acero -lparquet -larrow_compute -larrow -larrow_bundled_dependencies \
91+
PKG_LIBS="$PKG_LIBS -larrow_dataset -larrow_acero -lparquet -larrow_compute -larrow_s3 -larrow -larrow_bundled_dependencies \
9192
-lutf8proc -lsnappy -lz -lzstd -llz4 -lbz2 ${BROTLI_LIBS} -lole32 \
9293
${MIMALLOC_LIBS} ${OPENSSL_LIBS}"
9394

@@ -186,6 +187,10 @@ add_feature_flags () {
186187
fi
187188
if arrow_built_with ARROW_S3; then
188189
PKG_CFLAGS_FEATURES="$PKG_CFLAGS_FEATURES -DARROW_R_WITH_S3"
190+
PKG_CONFIG_NAMES_FEATURES="$PKG_CONFIG_NAMES_FEATURES arrow-s3"
191+
PKG_LIBS_FEATURES_WITHOUT_PC="-larrow_s3 $PKG_LIBS_FEATURES_WITHOUT_PC"
192+
# NOTE: arrow_s3 is assumed to have the same -L flag as arrow
193+
# so there is no need to add its location to PKG_DIRS
189194
fi
190195
if arrow_built_with ARROW_GCS; then
191196
PKG_CFLAGS_FEATURES="$PKG_CFLAGS_FEATURES -DARROW_R_WITH_GCS"
@@ -286,6 +291,7 @@ function configure_dev() {
286291

287292
if [ $(cmake_option ARROW_S3) -eq 1 ]; then
288293
PKG_CFLAGS="$PKG_CFLAGS -DARROW_R_WITH_S3"
294+
PKG_CONFIG_PACKAGES="$PKG_CONFIG_PACKAGES arrow-s3"
289295
fi
290296

291297
if [ $(cmake_option ARROW_GCS) -eq 1 ]; then

0 commit comments

Comments
 (0)