hiroyuki-sato commented on code in PR #50856:
URL: https://github.com/apache/arrow/pull/50856#discussion_r3773006773
##########
r/inst/build_arrow_static.sh:
##########
@@ -62,61 +62,66 @@ case "$CXX" in
;;
esac
+
+CMAKE_COMMAND=("${CMAKE}")
+
# Used for Emscripten
-: ${CMAKE_WRAPPER:=""}
+if [[ -n "${CMAKE_WRAPPER:-}" ]]; then
+ CMAKE_COMMAND=("${CMAKE_WRAPPER}" "${CMAKE}")
+fi
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
-${CMAKE_WRAPPER} ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
+"${CMAKE_COMMAND[@]}" -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_SNAPPY_USE_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_STATIC=ON \
- -DARROW_ACERO=${ARROW_ACERO:-ON} \
+ -DARROW_ACERO="${ARROW_ACERO:-ON}" \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
- -DARROW_DATASET=${ARROW_DATASET:-ON} \
- -DARROW_DEPENDENCY_SOURCE=${ARROW_DEPENDENCY_SOURCE:-AUTO} \
- -DARROW_DEPENDENCY_USE_SHARED=${ARROW_DEPENDENCY_USE_SHARED:-ON} \
- -DARROW_ENABLE_THREADING=${ARROW_ENABLE_THREADING:-ON} \
- -DAWSSDK_SOURCE=${AWSSDK_SOURCE:-} \
- -DBoost_SOURCE=${Boost_SOURCE:-} \
- -Dlz4_SOURCE=${lz4_SOURCE:-} \
+ -DARROW_DATASET="${ARROW_DATASET:-ON}" \
+ -DARROW_DEPENDENCY_SOURCE="${ARROW_DEPENDENCY_SOURCE:-AUTO}" \
+ -DARROW_DEPENDENCY_USE_SHARED="${ARROW_DEPENDENCY_USE_SHARED:-ON}" \
+ -DARROW_ENABLE_THREADING="${ARROW_ENABLE_THREADING:-ON}" \
+ -DAWSSDK_SOURCE="${AWSSDK_SOURCE:-}" \
+ -DBoost_SOURCE="${Boost_SOURCE:-}" \
+ -Dlz4_SOURCE="${lz4_SOURCE:-}" \
-DARROW_FILESYSTEM=ON \
- -DARROW_GCS=${ARROW_GCS:-OFF} \
- -DARROW_AZURE=${ARROW_AZURE:-$ARROW_DEFAULT_PARAM} \
- -DARROW_JEMALLOC=${ARROW_JEMALLOC:-$ARROW_DEFAULT_PARAM} \
- -DARROW_MIMALLOC=${ARROW_MIMALLOC:-ON} \
- -DARROW_JSON=${ARROW_JSON:-ON} \
- -DARROW_PARQUET=${ARROW_PARQUET:-ON} \
- -DARROW_S3=${ARROW_S3:-$ARROW_DEFAULT_PARAM} \
- -DARROW_WITH_BROTLI=${ARROW_WITH_BROTLI:-$ARROW_DEFAULT_PARAM} \
- -DARROW_WITH_BZ2=${ARROW_WITH_BZ2:-$ARROW_DEFAULT_PARAM} \
- -DARROW_WITH_LZ4=${ARROW_WITH_LZ4:-ON} \
- -DARROW_WITH_RE2=${ARROW_WITH_RE2:-ON} \
- -DARROW_WITH_SNAPPY=${ARROW_WITH_SNAPPY:-ON} \
- -DARROW_WITH_UTF8PROC=${ARROW_WITH_UTF8PROC:-ON} \
- -DARROW_WITH_ZLIB=${ARROW_WITH_ZLIB:-$ARROW_DEFAULT_PARAM} \
- -DARROW_WITH_ZSTD=${ARROW_WITH_ZSTD:-$ARROW_DEFAULT_PARAM} \
- -DARROW_VERBOSE_THIRDPARTY_BUILD=${ARROW_VERBOSE_THIRDPARTY_BUILD:-OFF} \
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} \
- -DCMAKE_FIND_DEBUG_MODE=${CMAKE_FIND_DEBUG_MODE:-OFF} \
+ -DARROW_GCS="${ARROW_GCS:-OFF}" \
+ -DARROW_AZURE="${ARROW_AZURE:-$ARROW_DEFAULT_PARAM}" \
+ -DARROW_JEMALLOC="${ARROW_JEMALLOC:-$ARROW_DEFAULT_PARAM}" \
+ -DARROW_MIMALLOC="${ARROW_MIMALLOC:-ON}" \
+ -DARROW_JSON="${ARROW_JSON:-ON}" \
+ -DARROW_PARQUET="${ARROW_PARQUET:-ON}" \
+ -DARROW_S3="${ARROW_S3:-$ARROW_DEFAULT_PARAM}" \
+ -DARROW_WITH_BROTLI="${ARROW_WITH_BROTLI:-$ARROW_DEFAULT_PARAM}" \
+ -DARROW_WITH_BZ2="${ARROW_WITH_BZ2:-$ARROW_DEFAULT_PARAM}" \
+ -DARROW_WITH_LZ4="${ARROW_WITH_LZ4:-ON}" \
+ -DARROW_WITH_RE2="${ARROW_WITH_RE2:-ON}" \
+ -DARROW_WITH_SNAPPY="${ARROW_WITH_SNAPPY:-ON}" \
+ -DARROW_WITH_UTF8PROC="${ARROW_WITH_UTF8PROC:-ON}" \
+ -DARROW_WITH_ZLIB="${ARROW_WITH_ZLIB:-$ARROW_DEFAULT_PARAM}" \
+ -DARROW_WITH_ZSTD="${ARROW_WITH_ZSTD:-$ARROW_DEFAULT_PARAM}" \
+ -DARROW_VERBOSE_THIRDPARTY_BUILD="${ARROW_VERBOSE_THIRDPARTY_BUILD:-OFF}" \
+ -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" \
+ -DCMAKE_FIND_DEBUG_MODE="${CMAKE_FIND_DEBUG_MODE:-OFF}" \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_INSTALL_PREFIX=${DEST_DIR} \
+ -DCMAKE_INSTALL_PREFIX="${DEST_DIR}" \
-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON \
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON \
- -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
- -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} \
- -Dabsl_SOURCE=${absl_SOURCE:-BUNDLED} \
- -Dre2_SOURCE=${re2_SOURCE:-BUNDLED} \
- -Dsimdjson_SOURCE=${simdjson_SOURCE:-BUNDLED} \
- -Dxsimd_SOURCE=${xsimd_SOURCE:-} \
- -Dzstd_SOURCE=${zstd_SOURCE:-} \
- ${EXTRA_CMAKE_FLAGS} \
+ -DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD:-OFF}" \
+ -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" \
+ -Dabsl_SOURCE="${absl_SOURCE:-BUNDLED}" \
+ -Dre2_SOURCE="${re2_SOURCE:-BUNDLED}" \
+ -Dsimdjson_SOURCE="${simdjson_SOURCE:-BUNDLED}" \
+ -Dxsimd_SOURCE="${xsimd_SOURCE:-}" \
+ -Dzstd_SOURCE="${zstd_SOURCE:-}" \
+ "${EXTRA_CMAKE_FLAGS}" \
-G "${CMAKE_GENERATOR:-Unix Makefiles}" \
- ${SOURCE_DIR}
+ "${SOURCE_DIR}"
Review Comment:
Fixed.
```diff
+# Convert the space-separated options into a Bash array.
+# This avoids ShellCheck SC2086 and preserves argument boundaries.
+read -r -a ARROW_EXTRA_CMAKE_FLAGS <<< "${EXTRA_CMAKE_FLAGS}"
+
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
"${CMAKE_COMMAND[@]}" -DARROW_BOOST_USE_SHARED=OFF \
@@ -117,7 +121,7 @@ pushd "${BUILD_DIR}"
-Dsimdjson_SOURCE="${simdjson_SOURCE:-BUNDLED}" \
-Dxsimd_SOURCE="${xsimd_SOURCE:-}" \
-Dzstd_SOURCE="${zstd_SOURCE:-}" \
- "${EXTRA_CMAKE_FLAGS}" \
+ "${ARROW_EXTRA_CMAKE_FLAGS[@]}" \
-G "${CMAKE_GENERATOR:-Unix Makefiles}" \
"${SOURCE_DIR}"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
