summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-10-04 11:51:58 -0700
committerArmin Kuster <akuster808@gmail.com>2017-11-15 15:47:04 -0800
commit6bdb28523bfbb555debad92ffb2f09088e4310b5 (patch)
tree93fded625bcbeb9a8e096789455149d6077f3926
parent5a70fffe603c2d2947c8499b8691cb3cda92888e (diff)
downloadmeta-openembedded-6bdb28523bfbb555debad92ffb2f09088e4310b5.tar.gz
mariadb: Do not use ucontext_* APIs with musl
musl has ucontext.h header but does not implement the APIs Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit b545c0643d2b2a1f1a816e789ff67116c613de5b) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/mysql/mariadb.inc1
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch28
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 689b8abf3..f3eb4c77e 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 "
20SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" 21SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324"
21SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" 22SRC_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 000000000..60e9199f9
--- /dev/null
+++ b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch
@@ -0,0 +1,28 @@
1From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 26 Mar 2017 14:30:33 -0700
4Subject: [PATCH] disable ucontext on musl
5
6musl does not have *contex() APIs even though it has ucontext.h header
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 include/my_context.h | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/include/my_context.h b/include/my_context.h
14index 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--
272.12.1
28