diff options
Diffstat (limited to 'tools/depends/target/mariadb/01-android.patch')
| -rw-r--r-- | tools/depends/target/mariadb/01-android.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/tools/depends/target/mariadb/01-android.patch b/tools/depends/target/mariadb/01-android.patch index 1087cd5dd8..4e397d5079 100644 --- a/tools/depends/target/mariadb/01-android.patch +++ b/tools/depends/target/mariadb/01-android.patch @@ -1,10 +1,9 @@ --- a/cmake/CheckIncludeFiles.cmake +++ b/cmake/CheckIncludeFiles.cmake -@@ -74,3 +74,12 @@ - CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H) - CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H) - CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_H) -+IF(HAVE_UCONTEXT_H) +@@ -50,4 +50,11 @@ + CHECK_INCLUDE_FILES (ucontext.h HAVE_FILE_UCONTEXT_H) + IF(NOT HAVE_FILE_UCONTEXT_H) + CHECK_INCLUDE_FILES (sys/ucontext.h HAVE_FILE_UCONTEXT_H) + CHECK_FUNCTION_EXISTS (getcontext HAVE_GETCONTEXT) + CHECK_FUNCTION_EXISTS (makecontext HAVE_MAKECONTEXT) + CHECK_FUNCTION_EXISTS (setcontext HAVE_SETCONTEXT) @@ -12,11 +11,11 @@ + IF(NOT HAVE_GETCONTEXT OR NOT HAVE_MAKECONTEXT OR NOT HAVE_SETCONTEXT OR NOT HAVE_SWAPCONTEXT) + SET(HAVE_UCONTEXT_H 0 CACHE INTERNAL "") + ENDIF() -+ENDIF(HAVE_UCONTEXT_H) + ENDIF() --- a/cmake/CheckTypes.cmake +++ b/cmake/CheckTypes.cmake -@@ -25,6 +25,7 @@ - CHECK_TYPE_SIZE(off_t SIZEOF_OFF_T) +@@ -22,6 +22,7 @@ + SET(CMAKE_EXTRA_INCLUDE_FILES sys/types.h) CHECK_TYPE_SIZE(uchar SIZEOF_UCHAR) CHECK_TYPE_SIZE(uint SIZEOF_UINT) +CHECK_TYPE_SIZE(ushort SIZEOF_USHORT) @@ -25,7 +24,7 @@ CHECK_TYPE_SIZE(uint8 SIZEOF_UINT8) --- a/include/ma_config.h.in +++ b/include/ma_config.h.in -@@ -217,6 +217,11 @@ +@@ -85,6 +85,11 @@ # define HAVE_UINT 1 #endif @@ -35,11 +34,11 @@ +#endif + #cmakedefine SIZEOF_ULONG @SIZEOF_ULONG@ - #if SIZEOF_ULONG + #if defined(SIZEOF_ULONG) # define HAVE_ULONG 1 --- a/include/ma_global.h +++ b/include/ma_global.h -@@ -272,6 +272,8 @@ +@@ -268,6 +268,8 @@ #if defined(__EMX__) || !defined(HAVE_UINT) typedef unsigned int uint; @@ -50,7 +49,7 @@ --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt -@@ -291,7 +291,6 @@ +@@ -311,7 +311,6 @@ IF(ICONV_INCLUDE_DIR) INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR}) ENDIF() |