diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index e5a1dcc6c6245f..225dd7426c4f67 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow @@ -61,12 +59,13 @@ else() set(THRIFT_USE_SHARED ${ARROW_DEPENDENCY_USE_SHARED}) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/cpp PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ${MALLOC_OPTIONS} + -DCMAKE_SYSTEM_PROCESSOR=${VCPKG_TARGET_ARCHITECTURE} -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} -DARROW_BUILD_TESTS=OFF @@ -83,7 +82,7 @@ vcpkg_configure_cmake( -DZSTD_MSVC_LIB_PREFIX= ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -91,7 +90,7 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib) message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.") endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/arrow) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/arrow) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index cdddf011af6dc6..2f73bca2088ece 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,10 +1,10 @@ { "name": "arrow", "version": "5.0.0", - "port-version": 1, + "port-version": 2, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", - "supports": "x64", + "supports": "x64 | (arm64 & !windows)", "dependencies": [ "boost-filesystem", "boost-multiprecision", @@ -19,6 +19,14 @@ "snappy", "thrift", "utf8proc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib", "zstd" ], diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 8d0b86eb61ad1c..bae3c3e99dc910 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a30c7d6553216924aa3a3957ceb87d0fda39592", + "version": "5.0.0", + "port-version": 2 + }, { "git-tree": "79938475d53bb40ad7bf8d0fbda9e65f7630dde7", "version": "5.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7ef8e9240129c4..b7db0ee826fe32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -170,7 +170,7 @@ }, "arrow": { "baseline": "5.0.0", - "port-version": 1 + "port-version": 2 }, "ashes": { "baseline": "2021-06-18",