diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-05-08 07:37:20 -0700 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2021-07-18 08:46:34 -0700 |
| commit | 5a9c8a31b73e97a60cd682b53c2497f8d4835dc7 (patch) | |
| tree | 0fb0dc5d4747d0d374c34044880fa593b27f5cf7 /meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch | |
| parent | 7628af5739ee981c33dc04b6d5b02c07d73aeb94 (diff) | |
| download | meta-openembedded-5a9c8a31b73e97a60cd682b53c2497f8d4835dc7.tar.gz | |
mariadb: Upgrade to 10.5.10
Drop fix-a-building-failure.patch because upstream has made is narrower
to apply to emulator builds and not just any cross compiling builds
Add missing dependency on boost
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 2183f0894110a6913c44bee9a1f4b1cea7639bdc)
[Bug fix only update:
CVE-2021-2166
CVE-2021-2154 ]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch new file mode 100644 index 0000000000..0f4815b185 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch @@ -0,0 +1,25 @@ +This is not needed for OE builds + +building failed since native does not generate import_executables.cmake +In fact, our building system will export the needed commands + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -392,11 +392,6 @@ CHECK_PCRE() + + CHECK_SYSTEMD() + +-IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR) +- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") +- INCLUDE(${IMPORT_EXECUTABLES}) +-ENDIF() +- + # + # Setup maintainer mode options. Platform checks are + # not run with the warning options as to not perturb fragile checks |