-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Needed with NDK r26. Cherry-picked from #35851.
- Loading branch information
Showing
6 changed files
with
35 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters