From 9aad47d679f0453fe354409afa5f19ac4179958d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 May 2021 21:55:00 -0700 Subject: mariadb: Include missing sys/type.h for ssize_t musl finds this problem in sources where its missing to include needed system header for ssize_t Fixes wsrep-lib/include/wsrep/gtid.hpp:80:5: error: unknown type name 'ssize_t'; did you mean 'size_t'? ssize_t scan_from_c_str(const char* buf, size_t buf_len, ^~~~~~~ size_t Signed-off-by: Khem Raj (cherry picked from commit 0298521fcd9eefdd9cd415b58740b972d65cf93c) Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 2974341bfe..25e630a16a 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -22,6 +22,7 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \ file://sys_futex.patch \ file://cross-compiling.patch \ + file://ssize_t.patch \ " SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch b/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch new file mode 100644 index 0000000000..4e499d4137 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch @@ -0,0 +1,15 @@ +ssize_t comes from sys/types.h therefore include it + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/wsrep-lib/include/wsrep/gtid.hpp ++++ b/wsrep-lib/include/wsrep/gtid.hpp +@@ -25,7 +25,7 @@ + #include "compiler.hpp" + + #include +- ++#include + /** + * Minimum number of bytes guaratneed to store GTID string representation, + * terminating '\0' not included (36 + 1 + 20). -- cgit 1.2.3-korg