2024-04-23 20:05:13 +02:00
|
|
|
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
|
2024-07-30 21:56:36 +00:00
|
|
|
index 6dc8358..2b91efa 100644
|
2024-04-23 20:05:13 +02:00
|
|
|
--- a/cpp/src/arrow/CMakeLists.txt
|
|
|
|
|
+++ b/cpp/src/arrow/CMakeLists.txt
|
|
|
|
|
@@ -166,7 +166,7 @@ if(WIN32)
|
2024-07-30 21:56:36 +00:00
|
|
|
list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32")
|
2024-04-02 00:30:49 +02:00
|
|
|
endif()
|
2024-12-02 16:29:01 -08:00
|
|
|
|
2024-04-02 00:30:49 +02:00
|
|
|
-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
|
2024-12-02 16:29:01 -08:00
|
|
|
|
2024-04-02 00:30:49 +02:00
|
|
|
#ifndef _WIN32
|
|
|
|
|
+# if !(defined(__ANDROID__) && __ANDROID_API__ < 26)
|
|
|
|
|
#define HAVE_LANGINFO 1
|
|
|
|
|
+# endif
|
|
|
|
|
#endif
|
2024-12-02 16:29:01 -08:00
|
|
|
|
2024-04-02 00:30:49 +02:00
|
|
|
#ifdef HAVE_LANGINFO
|
