aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-05-31 21:55:00 -0700
committerArmin Kuster <akuster808@gmail.com>2021-07-18 08:47:42 -0700
commit9aad47d679f0453fe354409afa5f19ac4179958d (patch)
treee779775f6c09bf463a6d9c47cd604d6fb0daa44b
parent5a9c8a31b73e97a60cd682b53c2497f8d4835dc7 (diff)
downloadmeta-openembedded-9aad47d679f0453fe354409afa5f19ac4179958d.tar.gz
meta-openembedded-9aad47d679f0453fe354409afa5f19ac4179958d.tar.bz2
meta-openembedded-9aad47d679f0453fe354409afa5f19ac4179958d.zip
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 <raj.khem@gmail.com> (cherry picked from commit 0298521fcd9eefdd9cd415b58740b972d65cf93c) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc1
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch15
2 files changed, 16 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 2974341bf..25e630a16 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 000000000..4e499d413
--- /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 <raj.khem@gmail.com>
+--- a/wsrep-lib/include/wsrep/gtid.hpp
++++ b/wsrep-lib/include/wsrep/gtid.hpp
+@@ -25,7 +25,7 @@
+ #include "compiler.hpp"
+
+ #include <iosfwd>
+-
++#include <sys/types.h>
+ /**
+ * Minimum number of bytes guaratneed to store GTID string representation,
+ * terminating '\0' not included (36 + 1 + 20).