android_armv7.patch 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 656aa7c74..4897369fa 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -1228,7 +1228,6 @@ check_symbol_exists(getifaddrs "${CURL_INCLUDES};stdlib.h" HAVE_GETIFADDRS)
  6. check_symbol_exists(freeaddrinfo "${CURL_INCLUDES}" HAVE_FREEADDRINFO)
  7. check_symbol_exists(pipe "${CURL_INCLUDES}" HAVE_PIPE)
  8. check_symbol_exists(ftruncate "${CURL_INCLUDES}" HAVE_FTRUNCATE)
  9. -check_symbol_exists(fseeko "${CURL_INCLUDES};stdio.h" HAVE_FSEEKO)
  10. check_symbol_exists(_fseeki64 "${CURL_INCLUDES};stdio.h" HAVE__FSEEKI64)
  11. check_symbol_exists(getpeername "${CURL_INCLUDES}" HAVE_GETPEERNAME)
  12. check_symbol_exists(getsockname "${CURL_INCLUDES}" HAVE_GETSOCKNAME)
  13. @@ -1238,10 +1237,6 @@ check_symbol_exists(setlocale "${CURL_INCLUDES}" HAVE_SETLOCALE)
  14. check_symbol_exists(setmode "${CURL_INCLUDES}" HAVE_SETMODE)
  15. check_symbol_exists(setrlimit "${CURL_INCLUDES}" HAVE_SETRLIMIT)
  16. -if(HAVE_FSEEKO)
  17. - set(HAVE_DECL_FSEEKO 1)
  18. -endif()
  19. -
  20. if(NOT MSVC OR (MSVC_VERSION GREATER_EQUAL 1900))
  21. # earlier MSVC compilers had faulty snprintf implementations
  22. check_symbol_exists(snprintf "stdio.h" HAVE_SNPRINTF)
  23. @@ -1304,6 +1299,14 @@ if(HAVE_FILE_OFFSET_BITS)
  24. endif()
  25. check_type_size("off_t" SIZEOF_OFF_T)
  26. +# fseeko may not exist with _FILE_OFFSET_BITS=64 but can exist with _FILE_OFFSET_BITS unset or 32 (e.g. Android ARMv7 with NDK 26b and API level < 24)
  27. +# so we need to test fseeko after testing for _FILE_OFFSEt_BITS
  28. +check_symbol_exists(fseeko "${CURL_INCLUDES};stdio.h" HAVE_FSEEKO)
  29. +
  30. +if(HAVE_FSEEKO)
  31. + set(HAVE_DECL_FSEEKO 1)
  32. +endif()
  33. +
  34. # include this header to get the type
  35. set(CMAKE_REQUIRED_INCLUDES "${CURL_SOURCE_DIR}/include")
  36. set(CMAKE_EXTRA_INCLUDE_FILES "curl/system.h")