From 7e5326c43831bb25518abb9ed994632ff398fc38 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Wed, 6 May 2015 11:05:40 +0800 Subject: mariadb: upgrade to 5.5.43 Signed-off-by: Roy Li Signed-off-by: Martin Jansa --- .../mysql/mariadb/fix-a-building-failure.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch (limited to 'meta-oe/recipes-support/mysql/mariadb') 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 +--- + 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 + -- cgit 1.2.3-korg