@@ -73,17 +73,6 @@ export ARROW_ORC
7373: " ${ARROW_S3:= ON} "
7474: " ${CMAKE_BUILD_TYPE:= Release} "
7575: " ${CMAKE_UNITY_BUILD:= ON} "
76- : " ${VCPKG_ROOT:=/ usr/ local/ vcpkg} "
77- : " ${VCPKG_OVERLAY_PORTS:= ${arrow_dir} / ci/ vcpkg/ overlay/ llvm} "
78- : " ${VCPKG_FEATURE_FLAGS:= -manifests} "
79- case " ${normalized_arch} " in
80- aarch_64)
81- : " ${VCPKG_TARGET_TRIPLET:= arm64-osx-static} "
82- ;;
83- x86_64)
84- : " ${VCPKG_TARGET_TRIPLET:= x64-osx-static} "
85- ;;
86- esac
8776
8877export ARROW_TEST_DATA=" ${arrow_dir} /testing/data"
8978export PARQUET_TEST_DATA=" ${arrow_dir} /cpp/submodules/parquet-testing/data"
@@ -98,7 +87,6 @@ cmake \
9887 -DARROW_CSV=" ${ARROW_DATASET} " \
9988 -DARROW_DATASET=" ${ARROW_DATASET} " \
10089 -DARROW_SUBSTRAIT=" ${ARROW_DATASET} " \
101- -DARROW_DEPENDENCY_SOURCE=" VCPKG" \
10290 -DARROW_DEPENDENCY_USE_SHARED=OFF \
10391 -DARROW_GANDIVA=" ${ARROW_GANDIVA} " \
10492 -DARROW_GANDIVA_STATIC_LIBSTDCPP=ON \
@@ -107,14 +95,15 @@ cmake \
10795 -DARROW_PARQUET=" ${ARROW_PARQUET} " \
10896 -DARROW_S3=" ${ARROW_S3} " \
10997 -DARROW_USE_CCACHE=" ${ARROW_USE_CCACHE} " \
98+ -DAWSSDK_SOURCE=BUNDLED \
11099 -DCMAKE_BUILD_TYPE=" ${CMAKE_BUILD_TYPE} " \
111100 -DCMAKE_INSTALL_PREFIX=" ${install_dir} " \
112- -DCMAKE_TOOLCHAIN_FILE=" ${VCPKG_ROOT} /scripts/buildsystems/vcpkg.cmake" \
113101 -DCMAKE_UNITY_BUILD=" ${CMAKE_UNITY_BUILD} " \
102+ -DGTest_SOURCE=BUNDLED \
114103 -DPARQUET_BUILD_EXAMPLES=OFF \
115104 -DPARQUET_BUILD_EXECUTABLES=OFF \
116105 -DPARQUET_REQUIRE_ENCRYPTION=OFF \
117- -DVCPKG_TARGET_TRIPLET= " ${VCPKG_TARGET_TRIPLET} " \
106+ -Dre2_SOURCE=BUNDLED \
118107 -GNinja
119108cmake --build " ${build_dir} /cpp" --target install
120109github_actions_group_end
@@ -171,12 +160,3 @@ archery linking check-dependencies \
171160 " gandiva_jni/${normalized_arch} /libgandiva_jni.dylib"
172161popd
173162github_actions_group_end
174-
175- JAVA_JNI_CMAKE_ARGS=" -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT} /scripts/buildsystems/vcpkg.cmake"
176- JAVA_JNI_CMAKE_ARGS=" ${JAVA_JNI_CMAKE_ARGS} -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} "
177- export JAVA_JNI_CMAKE_ARGS
178- " ${source_dir} /ci/scripts/jni_build.sh" \
179- " ${source_dir} " \
180- " ${install_dir} " \
181- " ${build_dir} " \
182- " ${dist_dir} "
0 commit comments