Skip to content

Commit 785b0bb

Browse files
committed
Revert "GH-48222: [CI][Dev] Fix shellcheck errors in ci/scripts/cpp_build.sh"
This reverts commit ac05df2.
1 parent ac05df2 commit 785b0bb

File tree

2 files changed

+126
-132
lines changed

2 files changed

+126
-132
lines changed

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ repos:
300300
?^ci/scripts/ccache_setup\.sh$|
301301
?^ci/scripts/conan_build\.sh$|
302302
?^ci/scripts/conan_setup\.sh$|
303-
?^ci/scripts/cpp_build\.sh$|
304303
?^ci/scripts/cpp_test\.sh$|
305304
?^ci/scripts/download_tz_database\.sh$|
306305
?^ci/scripts/install_azurite\.sh$|

ci/scripts/cpp_build.sh

Lines changed: 126 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ set -ex
2222
source_dir=${1}/cpp
2323
build_dir=${2}/cpp
2424

25-
: "${ARROW_OFFLINE:=OFF}"
26-
: "${ARROW_USE_CCACHE:=OFF}"
27-
: "${BUILD_DOCS_CPP:=OFF}"
25+
: ${ARROW_OFFLINE:=OFF}
26+
: ${ARROW_USE_CCACHE:=OFF}
27+
: ${BUILD_DOCS_CPP:=OFF}
2828

2929
if [ -x "$(command -v git)" ]; then
30-
git config --global --add safe.directory "${1}"
30+
git config --global --add safe.directory ${1}
3131
fi
3232

3333
# TODO(kszucs): consider to move these to CMake
34-
if [ -n "${CONDA_PREFIX}" ] && [ "${ARROW_EMSCRIPTEN:-OFF}" = "OFF" ]; then
34+
if [ ! -z "${CONDA_PREFIX}" ] && [ "${ARROW_EMSCRIPTEN:-OFF}" = "OFF" ]; then
3535
echo -e "===\n=== Conda environment for build\n==="
3636
conda list
3737

@@ -42,19 +42,17 @@ if [ -n "${CONDA_PREFIX}" ] && [ "${ARROW_EMSCRIPTEN:-OFF}" = "OFF" ]; then
4242
ARROW_CMAKE_ARGS+=" -DCMAKE_RANLIB=${RANLIB}"
4343
fi
4444
export ARROW_CMAKE_ARGS
45-
ARROW_GANDIVA_PC_CXX_FLAGS=$(echo | ${CXX} -E -Wp,-v -xc++ - 2>&1 | grep '^ ' | awk '{print "-isystem;" substr($1, 1)}' | tr '\n' ';')
46-
export ARROW_GANDIVA_PC_CXX_FLAGS
45+
export ARROW_GANDIVA_PC_CXX_FLAGS=$(echo | ${CXX} -E -Wp,-v -xc++ - 2>&1 | grep '^ ' | awk '{print "-isystem;" substr($1, 1)}' | tr '\n' ';')
4746
elif [ -x "$(command -v xcrun)" ]; then
48-
ARROW_GANDIVA_PC_CXX_FLAGS="-isysroot;$(xcrun --show-sdk-path)"
49-
export ARROW_GANDIVA_PC_CXX_FLAGS
47+
export ARROW_GANDIVA_PC_CXX_FLAGS="-isysroot;$(xcrun --show-sdk-path)"
5048
fi
5149

5250
if [ "${GITHUB_ACTIONS:-false}" = "true" ]; then
5351
case "$(uname)" in
5452
Linux|Darwin|MINGW*)
5553
if [ "${ARROW_GDB:-OFF}" != "ON" ]; then
56-
: "${ARROW_C_FLAGS_DEBUG:=-g1}"
57-
: "${ARROW_CXX_FLAGS_DEBUG:=-g1}"
54+
: ${ARROW_C_FLAGS_DEBUG:=-g1}
55+
: ${ARROW_CXX_FLAGS_DEBUG:=-g1}
5856
fi
5957
;;
6058
*)
@@ -99,13 +97,12 @@ case "$(uname)" in
9997
;;
10098
esac
10199

102-
mkdir -p "${build_dir}"
103-
pushd "${build_dir}"
100+
mkdir -p ${build_dir}
101+
pushd ${build_dir}
104102

105103
if [ "${ARROW_OFFLINE}" = "ON" ]; then
106-
"${source_dir}"/thirdparty/download_dependencies.sh "${PWD}"/thirdparty > \
104+
${source_dir}/thirdparty/download_dependencies.sh ${PWD}/thirdparty > \
107105
enable_offline_build.sh
108-
# shellcheck source=/dev/null
109106
. enable_offline_build.sh
110107
# We can't use mv because we can't remove /etc/resolv.conf in Docker
111108
# container.
@@ -144,166 +141,164 @@ if [ "${ARROW_USE_MESON:-OFF}" = "ON" ]; then
144141
fi
145142
fi
146143
meson setup \
147-
--prefix="${MESON_PREFIX:-${ARROW_HOME}}" \
148-
--buildtype="${ARROW_BUILD_TYPE:-debug}" \
144+
--prefix=${MESON_PREFIX:-${ARROW_HOME}} \
145+
--buildtype=${ARROW_BUILD_TYPE:-debug} \
149146
--pkg-config-path="${CONDA_PREFIX}/lib/pkgconfig/" \
150147
-Dauto_features=enabled \
151148
-Dfuzzing=disabled \
152149
-Ds3=disabled \
153150
. \
154-
"${source_dir}"
151+
${source_dir}
155152

156153
CC="${ORIGINAL_CC}"
157154
CXX="${ORIGINAL_CXX}"
158155
elif [ "${ARROW_EMSCRIPTEN:-OFF}" = "ON" ]; then
159156
if [ "${UBUNTU}" = "20.04" ]; then
160157
echo "arrow emscripten build is not supported on Ubuntu 20.04, run with UBUNTU=22.04"
161-
exit 1
158+
exit -1
162159
fi
163160
n_jobs=2 # Emscripten build fails on docker unless this is set really low
164-
# shellcheck source=/dev/null
165161
source ~/emsdk/emsdk_env.sh
166-
CMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot
167-
export CMAKE_INSTALL_PREFIX
162+
export CMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot
168163
# conda sets LDFLAGS / CFLAGS etc. which break
169164
# emcmake so we unset them
170165
unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
171166
emcmake cmake \
172-
--preset=ninja-"${ARROW_BUILD_TYPE:-debug}"-emscripten \
173-
-DCMAKE_VERBOSE_MAKEFILE="${CMAKE_VERBOSE_MAKEFILE:-OFF}" \
167+
--preset=ninja-${ARROW_BUILD_TYPE:-debug}-emscripten \
168+
-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE:-OFF} \
174169
-DCMAKE_C_FLAGS="${CFLAGS:-}" \
175170
-DCMAKE_CXX_FLAGS="${CXXFLAGS:-}" \
176171
-DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
177-
-DCMAKE_INSTALL_LIBDIR="${CMAKE_INSTALL_LIBDIR:-lib}" \
178-
-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}}" \
179-
-DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD:-OFF}" \
180-
"${ARROW_CMAKE_ARGS}" \
181-
"${source_dir}"
172+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR:-lib} \
173+
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}} \
174+
-DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
175+
${ARROW_CMAKE_ARGS} \
176+
${source_dir}
182177
elif [ -n "${CMAKE_PRESET}" ]; then
183178
cmake \
184179
--preset="${CMAKE_PRESET}" \
185-
"${ARROW_CMAKE_ARGS}" \
186-
"${source_dir}"
180+
${ARROW_CMAKE_ARGS} \
181+
${source_dir}
187182
else
188183
cmake \
189-
-Dabsl_SOURCE="${absl_SOURCE:-}" \
190-
-DARROW_ACERO="${ARROW_ACERO:-OFF}" \
191-
-DARROW_AZURE="${ARROW_AZURE:-OFF}" \
192-
-DARROW_BOOST_USE_SHARED="${ARROW_BOOST_USE_SHARED:-ON}" \
193-
-DARROW_BUILD_BENCHMARKS_REFERENCE="${ARROW_BUILD_BENCHMARKS:-OFF}" \
194-
-DARROW_BUILD_BENCHMARKS="${ARROW_BUILD_BENCHMARKS:-OFF}" \
195-
-DARROW_BUILD_EXAMPLES="${ARROW_BUILD_EXAMPLES:-OFF}" \
196-
-DARROW_BUILD_INTEGRATION="${ARROW_BUILD_INTEGRATION:-OFF}" \
197-
-DARROW_BUILD_SHARED="${ARROW_BUILD_SHARED:-ON}" \
198-
-DARROW_BUILD_STATIC="${ARROW_BUILD_STATIC:-ON}" \
199-
-DARROW_BUILD_TESTS="${ARROW_BUILD_TESTS:-OFF}" \
200-
-DARROW_BUILD_UTILITIES="${ARROW_BUILD_UTILITIES:-ON}" \
201-
-DARROW_COMPUTE="${ARROW_COMPUTE:-ON}" \
202-
-DARROW_CSV="${ARROW_CSV:-ON}" \
203-
-DARROW_CUDA="${ARROW_CUDA:-OFF}" \
204-
-DARROW_CXXFLAGS="${ARROW_CXXFLAGS:-}" \
184+
-Dabsl_SOURCE=${absl_SOURCE:-} \
185+
-DARROW_ACERO=${ARROW_ACERO:-OFF} \
186+
-DARROW_AZURE=${ARROW_AZURE:-OFF} \
187+
-DARROW_BOOST_USE_SHARED=${ARROW_BOOST_USE_SHARED:-ON} \
188+
-DARROW_BUILD_BENCHMARKS_REFERENCE=${ARROW_BUILD_BENCHMARKS:-OFF} \
189+
-DARROW_BUILD_BENCHMARKS=${ARROW_BUILD_BENCHMARKS:-OFF} \
190+
-DARROW_BUILD_EXAMPLES=${ARROW_BUILD_EXAMPLES:-OFF} \
191+
-DARROW_BUILD_INTEGRATION=${ARROW_BUILD_INTEGRATION:-OFF} \
192+
-DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED:-ON} \
193+
-DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC:-ON} \
194+
-DARROW_BUILD_TESTS=${ARROW_BUILD_TESTS:-OFF} \
195+
-DARROW_BUILD_UTILITIES=${ARROW_BUILD_UTILITIES:-ON} \
196+
-DARROW_COMPUTE=${ARROW_COMPUTE:-ON} \
197+
-DARROW_CSV=${ARROW_CSV:-ON} \
198+
-DARROW_CUDA=${ARROW_CUDA:-OFF} \
199+
-DARROW_CXXFLAGS=${ARROW_CXXFLAGS:-} \
205200
-DARROW_CXX_FLAGS_DEBUG="${ARROW_CXX_FLAGS_DEBUG:-}" \
206201
-DARROW_CXX_FLAGS_RELEASE="${ARROW_CXX_FLAGS_RELEASE:-}" \
207202
-DARROW_CXX_FLAGS_RELWITHDEBINFO="${ARROW_CXX_FLAGS_RELWITHDEBINFO:-}" \
208203
-DARROW_C_FLAGS_DEBUG="${ARROW_C_FLAGS_DEBUG:-}" \
209204
-DARROW_C_FLAGS_RELEASE="${ARROW_C_FLAGS_RELEASE:-}" \
210205
-DARROW_C_FLAGS_RELWITHDEBINFO="${ARROW_C_FLAGS_RELWITHDEBINFO:-}" \
211-
-DARROW_DATASET="${ARROW_DATASET:-OFF}" \
212-
-DARROW_DEPENDENCY_SOURCE="${ARROW_DEPENDENCY_SOURCE:-AUTO}" \
213-
-DARROW_DEPENDENCY_USE_SHARED="${ARROW_DEPENDENCY_USE_SHARED:-ON}" \
214-
-DARROW_ENABLE_THREADING="${ARROW_ENABLE_THREADING:-ON}" \
215-
-DARROW_ENABLE_TIMING_TESTS="${ARROW_ENABLE_TIMING_TESTS:-ON}" \
216-
-DARROW_EXTRA_ERROR_CONTEXT="${ARROW_EXTRA_ERROR_CONTEXT:-OFF}" \
217-
-DARROW_FILESYSTEM="${ARROW_FILESYSTEM:-ON}" \
218-
-DARROW_FLIGHT="${ARROW_FLIGHT:-OFF}" \
219-
-DARROW_FLIGHT_SQL="${ARROW_FLIGHT_SQL:-OFF}" \
220-
-DARROW_FLIGHT_SQL_ODBC="${ARROW_FLIGHT_SQL_ODBC:-OFF}" \
221-
-DARROW_FUZZING="${ARROW_FUZZING:-OFF}" \
222-
-DARROW_GANDIVA_PC_CXX_FLAGS="${ARROW_GANDIVA_PC_CXX_FLAGS:-}" \
223-
-DARROW_GANDIVA="${ARROW_GANDIVA:-OFF}" \
224-
-DARROW_GCS="${ARROW_GCS:-OFF}" \
225-
-DARROW_HDFS="${ARROW_HDFS:-ON}" \
226-
-DARROW_INSTALL_NAME_RPATH="${ARROW_INSTALL_NAME_RPATH:-ON}" \
227-
-DARROW_JEMALLOC="${ARROW_JEMALLOC:-OFF}" \
228-
-DARROW_JSON="${ARROW_JSON:-ON}" \
229-
-DARROW_LARGE_MEMORY_TESTS="${ARROW_LARGE_MEMORY_TESTS:-OFF}" \
230-
-DARROW_MIMALLOC="${ARROW_MIMALLOC:-ON}" \
231-
-DARROW_ORC="${ARROW_ORC:-OFF}" \
232-
-DARROW_PARQUET="${ARROW_PARQUET:-OFF}" \
233-
-DARROW_RUNTIME_SIMD_LEVEL="${ARROW_RUNTIME_SIMD_LEVEL:-MAX}" \
234-
-DARROW_S3="${ARROW_S3:-OFF}" \
235-
-DARROW_SIMD_LEVEL="${ARROW_SIMD_LEVEL:-DEFAULT}" \
236-
-DARROW_SUBSTRAIT="${ARROW_SUBSTRAIT:-OFF}" \
237-
-DARROW_TEST_LINKAGE="${ARROW_TEST_LINKAGE:-shared}" \
238-
-DARROW_TEST_MEMCHECK="${ARROW_TEST_MEMCHECK:-OFF}" \
239-
-DARROW_USE_ASAN="${ARROW_USE_ASAN:-OFF}" \
240-
-DARROW_USE_CCACHE="${ARROW_USE_CCACHE:-ON}" \
241-
-DARROW_USE_GLOG="${ARROW_USE_GLOG:-OFF}" \
242-
-DARROW_USE_LLD="${ARROW_USE_LLD:-OFF}" \
243-
-DARROW_USE_MOLD="${ARROW_USE_MOLD:-OFF}" \
244-
-DARROW_USE_STATIC_CRT="${ARROW_USE_STATIC_CRT:-OFF}" \
245-
-DARROW_USE_TSAN="${ARROW_USE_TSAN:-OFF}" \
246-
-DARROW_USE_UBSAN="${ARROW_USE_UBSAN:-OFF}" \
247-
-DARROW_VERBOSE_THIRDPARTY_BUILD="${ARROW_VERBOSE_THIRDPARTY_BUILD:-OFF}" \
248-
-DARROW_WITH_BROTLI="${ARROW_WITH_BROTLI:-OFF}" \
249-
-DARROW_WITH_BZ2="${ARROW_WITH_BZ2:-OFF}" \
250-
-DARROW_WITH_LZ4="${ARROW_WITH_LZ4:-OFF}" \
251-
-DARROW_WITH_OPENTELEMETRY="${ARROW_WITH_OPENTELEMETRY:-OFF}" \
252-
-DARROW_WITH_MUSL="${ARROW_WITH_MUSL:-OFF}" \
253-
-DARROW_WITH_SNAPPY="${ARROW_WITH_SNAPPY:-OFF}" \
254-
-DARROW_WITH_UTF8PROC="${ARROW_WITH_UTF8PROC:-ON}" \
255-
-DARROW_WITH_ZLIB="${ARROW_WITH_ZLIB:-OFF}" \
256-
-DARROW_WITH_ZSTD="${ARROW_WITH_ZSTD:-OFF}" \
257-
-DAWSSDK_SOURCE="${AWSSDK_SOURCE:-}" \
258-
-DAzure_SOURCE="${Azure_SOURCE:-}" \
259-
-Dbenchmark_SOURCE="${benchmark_SOURCE:-}" \
260-
-DBOOST_SOURCE="${BOOST_SOURCE:-}" \
261-
-DBrotli_SOURCE="${Brotli_SOURCE:-}" \
262-
-DBUILD_WARNING_LEVEL="${BUILD_WARNING_LEVEL:-CHECKIN}" \
263-
-Dc-ares_SOURCE="${cares_SOURCE:-}" \
264-
-DCMAKE_BUILD_TYPE="${ARROW_BUILD_TYPE:-debug}" \
265-
-DCMAKE_VERBOSE_MAKEFILE="${CMAKE_VERBOSE_MAKEFILE:-OFF}" \
206+
-DARROW_DATASET=${ARROW_DATASET:-OFF} \
207+
-DARROW_DEPENDENCY_SOURCE=${ARROW_DEPENDENCY_SOURCE:-AUTO} \
208+
-DARROW_DEPENDENCY_USE_SHARED=${ARROW_DEPENDENCY_USE_SHARED:-ON} \
209+
-DARROW_ENABLE_THREADING=${ARROW_ENABLE_THREADING:-ON} \
210+
-DARROW_ENABLE_TIMING_TESTS=${ARROW_ENABLE_TIMING_TESTS:-ON} \
211+
-DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
212+
-DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
213+
-DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
214+
-DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
215+
-DARROW_FLIGHT_SQL_ODBC=${ARROW_FLIGHT_SQL_ODBC:-OFF} \
216+
-DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
217+
-DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
218+
-DARROW_GANDIVA=${ARROW_GANDIVA:-OFF} \
219+
-DARROW_GCS=${ARROW_GCS:-OFF} \
220+
-DARROW_HDFS=${ARROW_HDFS:-ON} \
221+
-DARROW_INSTALL_NAME_RPATH=${ARROW_INSTALL_NAME_RPATH:-ON} \
222+
-DARROW_JEMALLOC=${ARROW_JEMALLOC:-OFF} \
223+
-DARROW_JSON=${ARROW_JSON:-ON} \
224+
-DARROW_LARGE_MEMORY_TESTS=${ARROW_LARGE_MEMORY_TESTS:-OFF} \
225+
-DARROW_MIMALLOC=${ARROW_MIMALLOC:-ON} \
226+
-DARROW_ORC=${ARROW_ORC:-OFF} \
227+
-DARROW_PARQUET=${ARROW_PARQUET:-OFF} \
228+
-DARROW_RUNTIME_SIMD_LEVEL=${ARROW_RUNTIME_SIMD_LEVEL:-MAX} \
229+
-DARROW_S3=${ARROW_S3:-OFF} \
230+
-DARROW_SIMD_LEVEL=${ARROW_SIMD_LEVEL:-DEFAULT} \
231+
-DARROW_SUBSTRAIT=${ARROW_SUBSTRAIT:-OFF} \
232+
-DARROW_TEST_LINKAGE=${ARROW_TEST_LINKAGE:-shared} \
233+
-DARROW_TEST_MEMCHECK=${ARROW_TEST_MEMCHECK:-OFF} \
234+
-DARROW_USE_ASAN=${ARROW_USE_ASAN:-OFF} \
235+
-DARROW_USE_CCACHE=${ARROW_USE_CCACHE:-ON} \
236+
-DARROW_USE_GLOG=${ARROW_USE_GLOG:-OFF} \
237+
-DARROW_USE_LLD=${ARROW_USE_LLD:-OFF} \
238+
-DARROW_USE_MOLD=${ARROW_USE_MOLD:-OFF} \
239+
-DARROW_USE_STATIC_CRT=${ARROW_USE_STATIC_CRT:-OFF} \
240+
-DARROW_USE_TSAN=${ARROW_USE_TSAN:-OFF} \
241+
-DARROW_USE_UBSAN=${ARROW_USE_UBSAN:-OFF} \
242+
-DARROW_VERBOSE_THIRDPARTY_BUILD=${ARROW_VERBOSE_THIRDPARTY_BUILD:-OFF} \
243+
-DARROW_WITH_BROTLI=${ARROW_WITH_BROTLI:-OFF} \
244+
-DARROW_WITH_BZ2=${ARROW_WITH_BZ2:-OFF} \
245+
-DARROW_WITH_LZ4=${ARROW_WITH_LZ4:-OFF} \
246+
-DARROW_WITH_OPENTELEMETRY=${ARROW_WITH_OPENTELEMETRY:-OFF} \
247+
-DARROW_WITH_MUSL=${ARROW_WITH_MUSL:-OFF} \
248+
-DARROW_WITH_SNAPPY=${ARROW_WITH_SNAPPY:-OFF} \
249+
-DARROW_WITH_UTF8PROC=${ARROW_WITH_UTF8PROC:-ON} \
250+
-DARROW_WITH_ZLIB=${ARROW_WITH_ZLIB:-OFF} \
251+
-DARROW_WITH_ZSTD=${ARROW_WITH_ZSTD:-OFF} \
252+
-DAWSSDK_SOURCE=${AWSSDK_SOURCE:-} \
253+
-DAzure_SOURCE=${Azure_SOURCE:-} \
254+
-Dbenchmark_SOURCE=${benchmark_SOURCE:-} \
255+
-DBOOST_SOURCE=${BOOST_SOURCE:-} \
256+
-DBrotli_SOURCE=${Brotli_SOURCE:-} \
257+
-DBUILD_WARNING_LEVEL=${BUILD_WARNING_LEVEL:-CHECKIN} \
258+
-Dc-ares_SOURCE=${cares_SOURCE:-} \
259+
-DCMAKE_BUILD_TYPE=${ARROW_BUILD_TYPE:-debug} \
260+
-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE:-OFF} \
266261
-DCMAKE_C_FLAGS="${CFLAGS:-}" \
267262
-DCMAKE_CXX_FLAGS="${CXXFLAGS:-}" \
268263
-DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
269-
-DCMAKE_INSTALL_LIBDIR="${CMAKE_INSTALL_LIBDIR:-lib}" \
270-
-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}}" \
271-
-DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD:-OFF}" \
272-
-DCUDAToolkit_ROOT="${CUDAToolkit_ROOT:-}" \
273-
-Dgflags_SOURCE="${gflags_SOURCE:-}" \
274-
-Dgoogle_cloud_cpp_storage_SOURCE="${google_cloud_cpp_storage_SOURCE:-}" \
275-
-DgRPC_SOURCE="${gRPC_SOURCE:-}" \
276-
-DGTest_SOURCE="${GTest_SOURCE:-}" \
277-
-Dlz4_SOURCE="${lz4_SOURCE:-}" \
278-
-Dopentelemetry-cpp_SOURCE="${opentelemetry_cpp_SOURCE:-}" \
279-
-DORC_SOURCE="${ORC_SOURCE:-}" \
280-
-DPARQUET_BUILD_EXAMPLES="${PARQUET_BUILD_EXAMPLES:-OFF}" \
281-
-DPARQUET_BUILD_EXECUTABLES="${PARQUET_BUILD_EXECUTABLES:-OFF}" \
282-
-DPARQUET_REQUIRE_ENCRYPTION="${PARQUET_REQUIRE_ENCRYPTION:-ON}" \
283-
-DProtobuf_SOURCE="${Protobuf_SOURCE:-}" \
284-
-DRapidJSON_SOURCE="${RapidJSON_SOURCE:-}" \
285-
-Dre2_SOURCE="${re2_SOURCE:-}" \
286-
-DSnappy_SOURCE="${Snappy_SOURCE:-}" \
287-
-DThrift_SOURCE="${Thrift_SOURCE:-}" \
288-
-Dutf8proc_SOURCE="${utf8proc_SOURCE:-}" \
289-
-Dzstd_SOURCE="${zstd_SOURCE:-}" \
290-
-Dxsimd_SOURCE="${xsimd_SOURCE:-}" \
264+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR:-lib} \
265+
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}} \
266+
-DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
267+
-DCUDAToolkit_ROOT=${CUDAToolkit_ROOT:-} \
268+
-Dgflags_SOURCE=${gflags_SOURCE:-} \
269+
-Dgoogle_cloud_cpp_storage_SOURCE=${google_cloud_cpp_storage_SOURCE:-} \
270+
-DgRPC_SOURCE=${gRPC_SOURCE:-} \
271+
-DGTest_SOURCE=${GTest_SOURCE:-} \
272+
-Dlz4_SOURCE=${lz4_SOURCE:-} \
273+
-Dopentelemetry-cpp_SOURCE=${opentelemetry_cpp_SOURCE:-} \
274+
-DORC_SOURCE=${ORC_SOURCE:-} \
275+
-DPARQUET_BUILD_EXAMPLES=${PARQUET_BUILD_EXAMPLES:-OFF} \
276+
-DPARQUET_BUILD_EXECUTABLES=${PARQUET_BUILD_EXECUTABLES:-OFF} \
277+
-DPARQUET_REQUIRE_ENCRYPTION=${PARQUET_REQUIRE_ENCRYPTION:-ON} \
278+
-DProtobuf_SOURCE=${Protobuf_SOURCE:-} \
279+
-DRapidJSON_SOURCE=${RapidJSON_SOURCE:-} \
280+
-Dre2_SOURCE=${re2_SOURCE:-} \
281+
-DSnappy_SOURCE=${Snappy_SOURCE:-} \
282+
-DThrift_SOURCE=${Thrift_SOURCE:-} \
283+
-Dutf8proc_SOURCE=${utf8proc_SOURCE:-} \
284+
-Dzstd_SOURCE=${zstd_SOURCE:-} \
285+
-Dxsimd_SOURCE=${xsimd_SOURCE:-} \
291286
-G "${CMAKE_GENERATOR:-Ninja}" \
292-
"${ARROW_CMAKE_ARGS}" \
293-
"${source_dir}"
287+
${ARROW_CMAKE_ARGS} \
288+
${source_dir}
294289
fi
295290

296-
: "${ARROW_BUILD_PARALLEL:=$(( n_jobs + 1))}"
291+
: ${ARROW_BUILD_PARALLEL:=$[${n_jobs} + 1]}
297292
if [ "${ARROW_USE_MESON:-OFF}" = "ON" ]; then
298-
time meson compile -j "${ARROW_BUILD_PARALLEL}"
293+
time meson compile -j ${ARROW_BUILD_PARALLEL}
299294
meson install
300295
# Remove all added files in cpp/subprojects/ because they may have
301296
# unreadable permissions on Docker host.
302297
pushd "${source_dir}"
303298
meson subprojects purge --confirm --include-cache
304299
popd
305300
else
306-
: "${CMAKE_BUILD_PARALLEL_LEVEL:=${ARROW_BUILD_PARALLEL}}"
301+
: ${CMAKE_BUILD_PARALLEL_LEVEL:=${ARROW_BUILD_PARALLEL}}
307302
export CMAKE_BUILD_PARALLEL_LEVEL
308303
time cmake --build . --target install
309304
fi
@@ -327,7 +322,7 @@ if [ -x "$(command -v ldconfig)" ]; then
327322
SUDO=
328323
fi
329324
fi
330-
${SUDO} ldconfig "${ARROW_HOME}"/"${CMAKE_INSTALL_LIBDIR:-lib}"
325+
${SUDO} ldconfig ${ARROW_HOME}/${CMAKE_INSTALL_LIBDIR:-lib}
331326
fi
332327

333328
if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
@@ -341,7 +336,7 @@ if command -v sccache &> /dev/null; then
341336
fi
342337

343338
if [ "${BUILD_DOCS_CPP}" == "ON" ]; then
344-
pushd "${source_dir}/apidoc"
339+
pushd ${source_dir}/apidoc
345340
OUTPUT_DIRECTORY=${build_dir}/apidoc doxygen
346341
popd
347342
fi

0 commit comments

Comments
 (0)