Skip to content

Enable arm64 build for Arrow #21467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 3 commits into from
Nov 19, 2021
Merged

Enable arm64 build for Arrow #21467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47d56ee
Enable arm64 build for Arrow
jgiannuzzi Nov 16, 2021
0952804
Fix deprecated function warning
jgiannuzzi Nov 16, 2021
d3d9e28
Update Arrow port version
jgiannuzzi Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ports/arrow/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/arrow
Expand Down Expand Up @@ -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
Expand All @@ -83,15 +82,15 @@ vcpkg_configure_cmake(
-DZSTD_MSVC_LIB_PREFIX=
)

vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_copy_pdbs()

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)
Expand Down
12 changes: 10 additions & 2 deletions ports/arrow/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -19,6 +19,14 @@
"snappy",
"thrift",
"utf8proc",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib",
"zstd"
],
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/arrow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8a30c7d6553216924aa3a3957ceb87d0fda39592",
"version": "5.0.0",
"port-version": 2
},
{
"git-tree": "79938475d53bb40ad7bf8d0fbda9e65f7630dde7",
"version": "5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
},
"arrow": {
"baseline": "5.0.0",
"port-version": 1
"port-version": 2
},
"ashes": {
"baseline": "2021-06-18",
Expand Down