diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-05-08 07:37:20 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-05-11 08:27:27 -0700 |
commit | 2183f0894110a6913c44bee9a1f4b1cea7639bdc (patch) | |
tree | 985b1c15225f19486c62c93f1206267ac6845c30 /meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch | |
parent | ca18e276d63e9fc6fece6a32e88959cbcf84c91b (diff) | |
download | meta-openembedded-2183f0894110a6913c44bee9a1f4b1cea7639bdc.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>
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 @@ | |||
1 | This is not needed for OE builds | ||
2 | |||
3 | building failed since native does not generate import_executables.cmake | ||
4 | In fact, our building system will export the needed commands | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | --- a/CMakeLists.txt | ||
13 | +++ b/CMakeLists.txt | ||
14 | @@ -392,11 +392,6 @@ CHECK_PCRE() | ||
15 | |||
16 | CHECK_SYSTEMD() | ||
17 | |||
18 | -IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR) | ||
19 | - SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") | ||
20 | - INCLUDE(${IMPORT_EXECUTABLES}) | ||
21 | -ENDIF() | ||
22 | - | ||
23 | # | ||
24 | # Setup maintainer mode options. Platform checks are | ||
25 | # not run with the warning options as to not perturb fragile checks | ||