diff options
| author | Mingli Yu <mingli.yu@windriver.com> | 2023-01-04 17:44:16 +0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2023-01-04 11:46:34 -0500 |
| commit | 279d7bb2d65d78a053730fa96cb125a411499db5 (patch) | |
| tree | 6cf14535c4f69ed8b4e2cc682b9a568e66605415 /meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch | |
| parent | e6628c78db74dd86eee157cd06281c2734197e70 (diff) | |
| download | meta-openembedded-279d7bb2d65d78a053730fa96cb125a411499db5.tar.gz | |
mariadb: not use qemu to run cross-compiled binaries
The build fails when use qemu to run build for amd64 as below:
| make -f libmariadb/libmariadb/CMakeFiles/mariadbclient.dir/build.make libmariadb/libmariadb/CMakeFiles/mariadbclient.dir/depend
| make -f libmariadb/libmariadb/CMakeFiles/libmariadb.dir/build.make libmariadb/libmariadb/CMakeFiles/libmariadb.dir/depend
| make[2]: Entering directory '/build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/build'
| cd /build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/build && /build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/recipe-sysroot-native/usr/bin/cmake -E cmake_depends "Unix Makefiles" /build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/mariadb-10.7.4 /build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/mariadb-10.7.4/libmariadb/libmariadb /build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/build /build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/build/libmariadb/libmariadb /build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/build/libmariadb/libmariadb/CMakeFiles/mariadbclient.dir/DependInfo.cmake --color=
| make[2]: Leaving directory '/build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/build'
| make -f libmariadb/libmariadb/CMakeFiles/mariadbclient.dir/build.make libmariadb/libmariadb/CMakeFiles/mariadbclient.dir/build
| Illegal instruction (core dumped)
| make[2]: *** [sql/CMakeFiles/GenServerSource.dir/build.make:76: sql/lex_hash.h] Error 132
| make[2]: *** Deleting file 'sql/lex_hash.h'
| make[2]: Entering directory '/build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/build'
| [ 8%] Linking C static library libmariadbclient.a
| cd /build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/build/libmariadb/libmariadb && /build/tmp-glibc/work/dbfp5-wrs-linux/mariadb/10.7.4-r0/recipe-sysroot-native/usr/bin/cmake -P CMakeFiles/mariadbclient.dir/cmake_clean_target.cmake
| Illegal instruction (core dumped)
| Illegal instruction (core dumped)
| make[2]: *** [scripts/CMakeFiles/GenFixPrivs.dir/build.make:78: scripts/mysql_fix_privilege_tables_sql.c] Error 132
So don't use qemu to run cross-compiled binaries.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4facf6815c4d10a4c7a373d81056af2533d0df12)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
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 | 34 |
1 files changed, 34 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..d0d6e3c730 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From 80be37351d995654f86b838f6b5ed47e8a90261b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Fri, 23 Sep 2022 12:05:17 +0800 | ||
| 4 | Subject: [PATCH] CMakeLists.txt: not include import_executables.cmake | ||
| 5 | |||
| 6 | building failed since native does not generate import_executables.cmake | ||
| 7 | In fact, our building system will export the needed commands. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [oe specific] | ||
| 10 | |||
| 11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 12 | --- | ||
| 13 | CMakeLists.txt | 5 ----- | ||
| 14 | 1 file changed, 5 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 17 | index f9e2b1b..34924ba 100644 | ||
| 18 | --- a/CMakeLists.txt | ||
| 19 | +++ b/CMakeLists.txt | ||
| 20 | @@ -394,11 +394,6 @@ CHECK_LIBFMT() | ||
| 21 | ADD_SUBDIRECTORY(tpool) | ||
| 22 | CHECK_SYSTEMD() | ||
| 23 | |||
| 24 | -IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR) | ||
| 25 | - SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") | ||
| 26 | - INCLUDE(${IMPORT_EXECUTABLES}) | ||
| 27 | -ENDIF() | ||
| 28 | - | ||
| 29 | # | ||
| 30 | # Setup maintainer mode options. Platform checks are | ||
| 31 | # not run with the warning options as to not perturb fragile checks | ||
| 32 | -- | ||
| 33 | 2.25.1 | ||
| 34 | |||
