diff options
| author | Khem Raj <raj.khem@gmail.com> | 2022-12-25 19:23:17 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-12-26 09:55:57 -0800 |
| commit | b9f1dd0e9460356195a73af229168ec6fa850349 (patch) | |
| tree | 93be5e6ebb743d6d93c4952dc1f25a28c9ec3afe /meta-oe/recipes-dbs | |
| parent | 25391e43c3b6c30a4da023e51c91f7d4751b262d (diff) | |
| download | meta-openembedded-b9f1dd0e9460356195a73af229168ec6fa850349.tar.gz | |
mariadb: Alias lseek64/open64/ftruncate64 on musl systems
This ensures it can keep building with newer musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 1a7cce2ea1..4e285aea7e 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
| @@ -21,6 +21,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ | |||
| 21 | file://sys_futex.patch \ | 21 | file://sys_futex.patch \ |
| 22 | file://cross-compiling.patch \ | 22 | file://cross-compiling.patch \ |
| 23 | file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ | 23 | file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ |
| 24 | file://lfs64.patch \ | ||
| 24 | " | 25 | " |
| 25 | SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" | 26 | SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" |
| 26 | SRC_URI[sha256sum] = "ffacf84e74daf249ad64b9573d79a4e882f66b004614f8b33bfcb14a8e25da1d" | 27 | SRC_URI[sha256sum] = "ffacf84e74daf249ad64b9573d79a4e882f66b004614f8b33bfcb14a8e25da1d" |
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch b/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch new file mode 100644 index 0000000000..9867908c6c --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | --- a/storage/connect/os.h | ||
| 2 | +++ b/storage/connect/os.h | ||
| 3 | @@ -2,13 +2,15 @@ | ||
| 4 | #ifndef _OS_H_INCLUDED | ||
| 5 | #define _OS_H_INCLUDED | ||
| 6 | |||
| 7 | -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) | ||
| 8 | +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) || (defined(__linux__) && !defined(__GLIBC__)) | ||
| 9 | typedef off_t off64_t; | ||
| 10 | #define lseek64(fd, offset, whence) lseek((fd), (offset), (whence)) | ||
| 11 | #define open64(path, flags, mode) open((path), (flags), (mode)) | ||
| 12 | #define ftruncate64(fd, length) ftruncate((fd), (length)) | ||
| 13 | +#ifndef O_LARGEFILE | ||
| 14 | #define O_LARGEFILE 0 | ||
| 15 | #endif | ||
| 16 | +#endif | ||
| 17 | |||
| 18 | #ifdef _AIX | ||
| 19 | #ifndef O_LARGEFILE | ||
