diff options
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb (renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.41.bb) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb.inc | 5 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch | 31 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.5.43.bb (renamed from meta-oe/recipes-support/mysql/mariadb_5.5.41.bb) | 0 |
4 files changed, 34 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.41.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb index 4ce960d7da..4ce960d7da 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.41.bb +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index f385bfcda5..00fa965ac0 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -11,10 +11,11 @@ SRC_URI = "http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$ file://my.cnf \ file://mysqld.service \ file://configure.cmake-fix-valgrind.patch \ + file://fix-a-building-failure.patch \ " -SRC_URI[md5sum] = "d2415efc6a6d73d7a58f3c79bb42f2e8" -SRC_URI[sha256sum] = "a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332" +SRC_URI[md5sum] = "c8760d6b5890fc1de76c07af48092c88" +SRC_URI[sha256sum] = "a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01" S = "${WORKDIR}/mariadb-${PV}" diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch b/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch new file mode 100644 index 0000000000..0c4e10237c --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch @@ -0,0 +1,31 @@ +[PATCH] fix a building failure + +Upstream-Status: Inappropriate [configuration] + +building failed since native does not generate import_executables.cmake +In fact, our building system will export the needed commands + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c1ce1c5..83b3a7e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -350,11 +350,6 @@ MYSQL_CHECK_READLINE() + + CHECK_JEMALLOC() + +-IF(CMAKE_CROSSCOMPILING) +- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") +- INCLUDE(${IMPORT_EXECUTABLES}) +-ENDIF() +- + # + # Setup maintainer mode options by the end. Platform checks are + # not run with the warning options as to not perturb fragile checks +-- +1.9.1 + diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.41.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.43.bb index 8f998a3a56..8f998a3a56 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.41.bb +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.43.bb |