diff options
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb.inc | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 0a0caa3f02..4019072516 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc | |||
| @@ -16,6 +16,7 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P | |||
| 16 | file://configure.cmake-fix-valgrind.patch \ | 16 | file://configure.cmake-fix-valgrind.patch \ |
| 17 | file://fix-a-building-failure.patch \ | 17 | file://fix-a-building-failure.patch \ |
| 18 | file://change-cc-to-cc-version.patch \ | 18 | file://change-cc-to-cc-version.patch \ |
| 19 | file://0001-disable-ucontext-on-musl.patch \ | ||
| 19 | " | 20 | " |
| 20 | SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" | 21 | SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" |
| 21 | SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" | 22 | SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" |
diff --git a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch new file mode 100644 index 0000000000..60e9199f95 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 26 Mar 2017 14:30:33 -0700 | ||
| 4 | Subject: [PATCH] disable ucontext on musl | ||
| 5 | |||
| 6 | musl does not have *contex() APIs even though it has ucontext.h header | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | include/my_context.h | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/include/my_context.h b/include/my_context.h | ||
| 14 | index dd44103..9b28c17 100644 | ||
| 15 | --- a/include/my_context.h | ||
| 16 | +++ b/include/my_context.h | ||
| 17 | @@ -31,7 +31,7 @@ | ||
| 18 | #define MY_CONTEXT_USE_X86_64_GCC_ASM | ||
| 19 | #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) | ||
| 20 | #define MY_CONTEXT_USE_I386_GCC_ASM | ||
| 21 | -#elif defined(HAVE_UCONTEXT_H) | ||
| 22 | +#elif defined(__GLIBC__) && defined(HAVE_UCONTEXT_H) | ||
| 23 | #define MY_CONTEXT_USE_UCONTEXT | ||
| 24 | #else | ||
| 25 | #define MY_CONTEXT_DISABLE | ||
| 26 | -- | ||
| 27 | 2.12.1 | ||
| 28 | |||
