diff options
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch')
-rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch index 0f4815b185..d0d6e3c730 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch @@ -1,18 +1,24 @@ -This is not needed for OE builds +From 80be37351d995654f86b838f6b5ed47e8a90261b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Fri, 23 Sep 2022 12:05:17 +0800 +Subject: [PATCH] CMakeLists.txt: not include import_executables.cmake building failed since native does not generate import_executables.cmake -In fact, our building system will export the needed commands +In fact, our building system will export the needed commands. -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [oe specific] -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> +--- + CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f9e2b1b..34924ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -392,11 +392,6 @@ CHECK_PCRE() - +@@ -394,11 +394,6 @@ CHECK_LIBFMT() + ADD_SUBDIRECTORY(tpool) CHECK_SYSTEMD() -IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR) @@ -23,3 +29,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> # # Setup maintainer mode options. Platform checks are # not run with the warning options as to not perturb fragile checks +-- +2.25.1 + |