mariadb: upgrade to 5.5.43

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Roy Li
2015-05-06 11:05:40 +08:00
committed by Martin Jansa
parent 31f8e39401
commit 7e5326c438
4 changed files with 34 additions and 2 deletions

View File

@@ -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}"

View File

@@ -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