mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 11:21:12 +08:00
Enable arm64 build for Arrow (#21467)
* Enable arm64 build for Arrow * Fix deprecated function warning * Update Arrow port version
This commit is contained in:
parent
36840f73d6
commit
77c4e0cb08
@ -1,5 +1,3 @@
|
|||||||
vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64")
|
|
||||||
|
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO apache/arrow
|
REPO apache/arrow
|
||||||
@ -61,12 +59,13 @@ else()
|
|||||||
set(THRIFT_USE_SHARED ${ARROW_DEPENDENCY_USE_SHARED})
|
set(THRIFT_USE_SHARED ${ARROW_DEPENDENCY_USE_SHARED})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
vcpkg_configure_cmake(
|
vcpkg_cmake_configure(
|
||||||
SOURCE_PATH ${SOURCE_PATH}/cpp
|
SOURCE_PATH ${SOURCE_PATH}/cpp
|
||||||
PREFER_NINJA
|
PREFER_NINJA
|
||||||
OPTIONS
|
OPTIONS
|
||||||
${FEATURE_OPTIONS}
|
${FEATURE_OPTIONS}
|
||||||
${MALLOC_OPTIONS}
|
${MALLOC_OPTIONS}
|
||||||
|
-DCMAKE_SYSTEM_PROCESSOR=${VCPKG_TARGET_ARCHITECTURE}
|
||||||
-DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
|
-DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
|
||||||
-DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
|
-DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
|
||||||
-DARROW_BUILD_TESTS=OFF
|
-DARROW_BUILD_TESTS=OFF
|
||||||
@ -83,7 +82,7 @@ vcpkg_configure_cmake(
|
|||||||
-DZSTD_MSVC_LIB_PREFIX=
|
-DZSTD_MSVC_LIB_PREFIX=
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_install_cmake()
|
vcpkg_cmake_install()
|
||||||
|
|
||||||
vcpkg_copy_pdbs()
|
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.")
|
message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.")
|
||||||
endif()
|
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}/debug/lib/cmake)
|
||||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"name": "arrow",
|
"name": "arrow",
|
||||||
"version": "5.0.0",
|
"version": "5.0.0",
|
||||||
"port-version": 1,
|
"port-version": 2,
|
||||||
"description": "Cross-language development platform for in-memory analytics",
|
"description": "Cross-language development platform for in-memory analytics",
|
||||||
"homepage": "https://arrow.apache.org",
|
"homepage": "https://arrow.apache.org",
|
||||||
"supports": "x64",
|
"supports": "x64 | (arm64 & !windows)",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"boost-filesystem",
|
"boost-filesystem",
|
||||||
"boost-multiprecision",
|
"boost-multiprecision",
|
||||||
@ -19,6 +19,14 @@
|
|||||||
"snappy",
|
"snappy",
|
||||||
"thrift",
|
"thrift",
|
||||||
"utf8proc",
|
"utf8proc",
|
||||||
|
{
|
||||||
|
"name": "vcpkg-cmake",
|
||||||
|
"host": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "vcpkg-cmake-config",
|
||||||
|
"host": true
|
||||||
|
},
|
||||||
"zlib",
|
"zlib",
|
||||||
"zstd"
|
"zstd"
|
||||||
],
|
],
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "8a30c7d6553216924aa3a3957ceb87d0fda39592",
|
||||||
|
"version": "5.0.0",
|
||||||
|
"port-version": 2
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "79938475d53bb40ad7bf8d0fbda9e65f7630dde7",
|
"git-tree": "79938475d53bb40ad7bf8d0fbda9e65f7630dde7",
|
||||||
"version": "5.0.0",
|
"version": "5.0.0",
|
||||||
|
@ -170,7 +170,7 @@
|
|||||||
},
|
},
|
||||||
"arrow": {
|
"arrow": {
|
||||||
"baseline": "5.0.0",
|
"baseline": "5.0.0",
|
||||||
"port-version": 1
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"ashes": {
|
"ashes": {
|
||||||
"baseline": "2021-06-18",
|
"baseline": "2021-06-18",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user