diff options
| author |   Mingli Yu <mingli.yu@windriver.com> | 2023-07-25 11:56:53 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-07-24 21:00:47 -0700 |
| commit | ad4a71137e4a3e4e53bc0492a15ce1025f3f9143 (patch) | |
| tree | db783c0ea006300c64c5e08349dea287285b144d /meta-oe/recipes-dbs/mysql/mariadb.inc | |
| parent | 7e565b5c0c09a9cd7c27eb24f8fb45a746469279 (diff) | |
| download | meta-openembedded-ad4a71137e4a3e4e53bc0492a15ce1025f3f9143.tar.gz | |
mariadb: Upgrade to 10.11.4
Rebase patch 0001-Add-missing-includes-cstdint-and-cstdio.patch to
the new version.
After the commit [1] introduced in the new version, there is below
build failure though uca-dump installed as [2], so copy the uca-dump
to the right place to fix the below failure.
make[2]: *** No rule to make target 'strings/uca-dump', needed by 'strings/ctype-uca1400data.h'. Stop.
[1] https://github.com/MariaDB/server/commit/6f6fa3bec2decb26598bce33d43594aabb25b201
[2] https://git.openembedded.org/meta-openembedded/commit/?id=1f69de300fd3b772830432eedeb2b055396494a6
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb.inc')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 57930dae39..2fb0bd7be5 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -25,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "1c89dee0caed0f68bc2a1d203eb98a123150e6a179f6ee0f1fc0ba3f08dc71dc" +SRC_URI[sha256sum] = "ce8dac125568cc5f40da74c17212767c92d8faed81066580b526a485a591127d" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -110,6 +110,11 @@ OECMAKE_GENERATOR = "Unix Makefiles" ARM_INSTRUCTION_SET:armv4 = "arm" ARM_INSTRUCTION_SET:armv5 = "arm" +do_compile:prepend:class-target () { + # remove the buildpath + sed -i -e "s:CMAKE_SYSROOT:CMAKE_SYSROOT_PLACE_HOLDER:g" ${S}/libmariadb/mariadb_config/mariadb_config.c.in +} + do_configure:append() { # handle distros with different values of ${libexecdir} libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` @@ -140,6 +145,7 @@ do_compile:prepend:class-target () { echo "#endif" >>${B}/include/openssl/kssl.h fi fi + install -D ${RECIPE_SYSROOT_NATIVE}/usr/bin/uca-dump ${B}/strings/uca-dump } SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" |