aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/mysql/mariadb
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-05-06 11:05:40 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-05-13 14:34:20 +0200
commit7e5326c43831bb25518abb9ed994632ff398fc38 (patch)
treec9a63e525a571b238d84d98bd7f2375c74fce47f /meta-oe/recipes-support/mysql/mariadb
parent31f8e3940196eec1506eba2faf01d839bc883247 (diff)
downloadmeta-openembedded-7e5326c43831bb25518abb9ed994632ff398fc38.tar.gz
meta-openembedded-7e5326c43831bb25518abb9ed994632ff398fc38.tar.bz2
meta-openembedded-7e5326c43831bb25518abb9ed994632ff398fc38.zip
mariadb: upgrade to 5.5.43
Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql/mariadb')
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch31
1 files changed, 31 insertions, 0 deletions
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 000000000..0c4e10237
--- /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
+