| Message ID | 1507143118-9319-1-git-send-email-armccurdy@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [oe,meta-oe,morty] mariadb: Do not use ucontext_* APIs with musl | expand |
On Wed, Oct 4, 2017 at 11:51 AM, Andre McCurdy <armccurdy@gmail.com> wrote: > From: Khem Raj <raj.khem@gmail.com> > > musl has ucontext.h header but does not implement the APIs Ping. CCing Armin. > Signed-off-by: Khem Raj <raj.khem@gmail.com> > (cherry picked from commit b545c0643d2b2a1f1a816e789ff67116c613de5b) > Signed-off-by: Andre McCurdy <armccurdy@gmail.com> > --- > meta-oe/recipes-support/mysql/mariadb.inc | 1 + > .../mariadb/0001-disable-ucontext-on-musl.patch | 28 ++++++++++++++++++++++ > 2 files changed, 29 insertions(+) > create mode 100644 meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch > > diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc > index 689b8ab..f3eb4c7 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 > file://configure.cmake-fix-valgrind.patch \ > file://fix-a-building-failure.patch \ > file://change-cc-to-cc-version.patch \ > + file://0001-disable-ucontext-on-musl.patch \ > " > SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" > 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 0000000..60e9199 > --- /dev/null > +++ b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch > @@ -0,0 +1,28 @@ > +From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001 > +From: Khem Raj <raj.khem@gmail.com> > +Date: Sun, 26 Mar 2017 14:30:33 -0700 > +Subject: [PATCH] disable ucontext on musl > + > +musl does not have *contex() APIs even though it has ucontext.h header > + > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > +--- > + include/my_context.h | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/include/my_context.h b/include/my_context.h > +index dd44103..9b28c17 100644 > +--- a/include/my_context.h > ++++ b/include/my_context.h > +@@ -31,7 +31,7 @@ > + #define MY_CONTEXT_USE_X86_64_GCC_ASM > + #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) > + #define MY_CONTEXT_USE_I386_GCC_ASM > +-#elif defined(HAVE_UCONTEXT_H) > ++#elif defined(__GLIBC__) && defined(HAVE_UCONTEXT_H) > + #define MY_CONTEXT_USE_UCONTEXT > + #else > + #define MY_CONTEXT_DISABLE > +-- > +2.12.1 > + > -- > 1.9.1 > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 689b8ab..f3eb4c7 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 file://configure.cmake-fix-valgrind.patch \ file://fix-a-building-failure.patch \ file://change-cc-to-cc-version.patch \ + file://0001-disable-ucontext-on-musl.patch \ " SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" 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 0000000..60e9199 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch @@ -0,0 +1,28 @@ +From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 26 Mar 2017 14:30:33 -0700 +Subject: [PATCH] disable ucontext on musl + +musl does not have *contex() APIs even though it has ucontext.h header + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/my_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/my_context.h b/include/my_context.h +index dd44103..9b28c17 100644 +--- a/include/my_context.h ++++ b/include/my_context.h +@@ -31,7 +31,7 @@ + #define MY_CONTEXT_USE_X86_64_GCC_ASM + #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) + #define MY_CONTEXT_USE_I386_GCC_ASM +-#elif defined(HAVE_UCONTEXT_H) ++#elif defined(__GLIBC__) && defined(HAVE_UCONTEXT_H) + #define MY_CONTEXT_USE_UCONTEXT + #else + #define MY_CONTEXT_DISABLE +-- +2.12.1 +