Skip to content

Commit

Permalink
[arrow] Fix android (#37878)
Browse files Browse the repository at this point in the history
Needed with NDK r26. Cherry-picked from #35851.
  • Loading branch information
dg0yt authored Apr 1, 2024
1 parent e0f1ab4 commit e58dac2
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 15 deletions.
27 changes: 27 additions & 0 deletions ports/arrow/android.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 05c05c6..f2754a5 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -973,7 +973,7 @@ if(WIN32)
list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
endif()

-if(NOT WIN32 AND NOT APPLE)
+if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
# Pass -lrt on Linux only
list(APPEND ARROW_SYSTEM_LINK_LIBS rt)
endif()
diff --git a/cpp/src/arrow/vendored/musl/strptime.c b/cpp/src/arrow/vendored/musl/strptime.c
index 41912fd..0ea36e9 100644
--- a/cpp/src/arrow/vendored/musl/strptime.c
+++ b/cpp/src/arrow/vendored/musl/strptime.c
@@ -18,7 +18,9 @@
#undef HAVE_LANGINFO

#ifndef _WIN32
+# if !(defined(__ANDROID__) && __ANDROID_API__ < 26)
#define HAVE_LANGINFO 1
+# endif
#endif

#ifdef HAVE_LANGINFO
13 changes: 0 additions & 13 deletions ports/arrow/fix-ci-error.patch

This file was deleted.

2 changes: 1 addition & 1 deletion ports/arrow/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE ${ARCHIVE_PATH}
PATCHES
android.patch
msvc-static-name.patch
utf8proc.patch
thrift.patch
fix-ci-error.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
1 change: 1 addition & 0 deletions ports/arrow/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "arrow",
"version": "15.0.2",
"port-version": 1,
"description": "Cross-language development platform for in-memory analytics",
"homepage": "https://arrow.apache.org",
"license": "Apache-2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/arrow.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "934c1383e14915071a7c9939bd61f38de5bd2c1b",
"version": "15.0.2",
"port-version": 1
},
{
"git-tree": "28965b502b1501b7832c506ea728e37924902909",
"version": "15.0.2",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
},
"arrow": {
"baseline": "15.0.2",
"port-version": 0
"port-version": 1
},
"arsenalgear": {
"baseline": "2.1.0",
Expand Down

0 comments on commit e58dac2

Please sign in to comment.