* rename mariadb_5.5.39.inc -> mariadb.inc * add dependency bision-native for mariadb-native * add revert-fix-for-MDEV-5120.patch to revert an commit for mariadb test suite which causes packages mysql-python and modphp fail to build * add PACKAGECONFIG 'libedit'
Signed-off-by: Kai Kang <[email protected]> --- ...b-native_5.5.39.bb => mariadb-native_5.5.40.bb} | 4 +- .../mysql/{mariadb_5.5.39.inc => mariadb.inc} | 6 ++- .../mysql/mariadb/revert-fix-for-MDEV-5120.patch | 46 ++++++++++++++++++++++ .../mysql/{mariadb_5.5.39.bb => mariadb_5.5.40.bb} | 3 +- 4 files changed, 53 insertions(+), 6 deletions(-) rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.39.bb => mariadb-native_5.5.40.bb} (82%) rename meta-oe/recipes-support/mysql/{mariadb_5.5.39.inc => mariadb.inc} (97%) create mode 100644 meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch rename meta-oe/recipes-support/mysql/{mariadb_5.5.39.bb => mariadb_5.5.40.bb} (96%) diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.39.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb similarity index 82% rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.39.bb rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb index 9148dee..4ce960d 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.39.bb +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb @@ -1,8 +1,8 @@ -require mariadb_${PV}.inc +require mariadb.inc inherit native PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native" +DEPENDS = "ncurses-native zlib-native bison-native" RDEPENDS_${PN} = "" PACKAGES = "" diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc b/meta-oe/recipes-support/mysql/mariadb.inc similarity index 97% rename from meta-oe/recipes-support/mysql/mariadb_5.5.39.inc rename to meta-oe/recipes-support/mysql/mariadb.inc index f9909eb..3d0f593 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.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://revert-fix-for-MDEV-5120.patch \ " -SRC_URI[md5sum] = "917a807d8cf2c8ef9deedd2a89b6decd" -SRC_URI[sha256sum] = "cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14" +SRC_URI[md5sum] = "561bede89a8bd19c374dad2d8f24fdfe" +SRC_URI[sha256sum] = "cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a" S = "${WORKDIR}/mariadb-${PV}" @@ -40,6 +41,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} PACKAGECONFIG_class-native = "" PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITHOUT_VALGRIND=TRUE,valgrind" +PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit" # MariaDB doesn't link properly with gold # https://mariadb.atlassian.net/browse/MDEV-5982 diff --git a/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch b/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch new file mode 100644 index 0000000..41493a1 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch @@ -0,0 +1,46 @@ +Revert mariadb commit revno 4300 in branch 5.5 which fixes +https://mariadb.atlassian.net/browse/MDEV-5120. + +------------------------------------------------------------ +revno: 4300 +fixes bug: https://mariadb.atlassian.net/browse/MDEV-5120 +committer: Sergei Golubchik <[email protected]> +branch nick: 5.5 +timestamp: Thu 2014-10-02 11:57:40 +0200 +message: + MDEV-5120 Test suite test maria-no-logging fails + + stat structure (from <sys/stat.h>) is conditionally defined + to have different layout and size depending on the defined macros. + The correct macro is defined in my_config.h, which means it MUST be + included first (or, at least before <features.h> - so, practically, + before including any system headers). +------------------------------------------------------------ + +It causes modphp fails to build. Bug MDEV-5120 is an test suite test +maria-no-logging fails. There is no side effect to revert it. + +Upstream-Status: Backport + +Signed-off-by: Kai Kang <[email protected]> +--- +--- mariadb-5.5.40/config.h.cmake.orig 2014-11-13 14:23:50.868147145 +0800 ++++ mariadb-5.5.40/config.h.cmake 2014-11-13 14:24:23.372148031 +0800 +@@ -641,17 +641,4 @@ + #cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@ + #cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@ + +-/* +- stat structure (from <sys/stat.h>) is conditionally defined +- to have different layout and size depending on the defined macros. +- The correct macro is defined in my_config.h, which means it MUST be +- included first (or at least before <features.h> - so, practically, +- before including any system headers). +- +- __GLIBC__ is defined in <features.h> +-*/ +-#ifdef __GLIBC__ +-#error <my_config.h> MUST be included first! +-#endif +- + #endif diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.40.bb similarity index 96% rename from meta-oe/recipes-support/mysql/mariadb_5.5.39.bb rename to meta-oe/recipes-support/mysql/mariadb_5.5.40.bb index fee5b62..f24cb43 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.bb +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.40.bb @@ -1,4 +1,4 @@ -require ${PN}_${PV}.inc +require mariadb.inc EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" @@ -25,4 +25,3 @@ RCONFLICTS_${PN}-client += "mysql5-client" RPROVIDES_${PN}-server += "mysql5-server" RREPLACES_${PN}-server += "mysql5-server" RCONFLICTS_${PN}-server += "mysql5-server" - -- 1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
