diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-03-08 21:14:15 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-03-08 21:15:24 +0200 |
| commit | 6e4ec8d55d87327ea4b9900825bd52086cb2f946 (patch) | |
| tree | f136ec67a8479d3f728b1b09497a40e06ce3a944 /main/mariadb/fix-ucontext-check.patch | |
| parent | 4beff7053aa1e127de99ee2c84ab7e90154ebdf5 (diff) | |
| download | aports-6e4ec8d55d87327ea4b9900825bd52086cb2f946.tar.bz2 aports-6e4ec8d55d87327ea4b9900825bd52086cb2f946.tar.xz | |
main/mariadb: fix ucontext configure check
musl ships the header for other purposes, but makecontext is not
implemented. fix the check to detect if makecontext is implemented
before enabling code using it.
Diffstat (limited to 'main/mariadb/fix-ucontext-check.patch')
| -rw-r--r-- | main/mariadb/fix-ucontext-check.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/main/mariadb/fix-ucontext-check.patch b/main/mariadb/fix-ucontext-check.patch new file mode 100644 index 0000000000..1e1d58ff36 --- /dev/null +++ b/main/mariadb/fix-ucontext-check.patch @@ -0,0 +1,19 @@ +diff -ru mariadb-10.1.12.orig/configure.cmake mariadb-10.1.12/configure.cmake +--- mariadb-10.1.12.orig/configure.cmake 2016-02-24 16:25:21.000000000 +0200 ++++ mariadb-10.1.12/configure.cmake 2016-03-08 21:11:52.767533395 +0200 +@@ -1087,9 +1087,12 @@ + CHECK_STRUCT_HAS_MEMBER("struct dirent" d_ino "dirent.h" STRUCT_DIRENT_HAS_D_INO) + CHECK_STRUCT_HAS_MEMBER("struct dirent" d_namlen "dirent.h" STRUCT_DIRENT_HAS_D_NAMLEN) + SET(SPRINTF_RETURNS_INT 1) +-CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) +-IF(NOT HAVE_UCONTEXT_H) +- CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H) ++CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_HEADER) ++IF(NOT HAVE_UCONTEXT_HEADER) ++ CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_HEADER) ++ENDIF() ++IF(HAVE_UCONTEXT_HEADER) ++ CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) + ENDIF() + + CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_sec "time.h" STRUCT_TIMESPEC_HAS_TV_SEC) |