@@ -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