From 097c6ede903dc0327ecaa4c0d03752b8d77d0d48 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Fri, 3 Jan 2014 22:59:23 +0200 Subject: mariadb: Add patch to fix urecognized options Add patch to tell autoconf about with-plugin option. In this way we avoid warnings like: configure: WARNING: unrecognized options: --with-plugin-maria Change-Id: Id64ac01d7f2072e1bca8979c5da3e8c6520105cb Signed-off-by: Andrei Gherzan Signed-off-by: Martin Jansa --- .../mysql/mariadb/avoid-plugin-options-warnings.patch | 17 +++++++++++++++++ meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch diff --git a/meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch b/meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch new file mode 100644 index 0000000000..84ff6f023d --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/avoid-plugin-options-warnings.patch @@ -0,0 +1,17 @@ +Tell autoconf about with-plugin option to avoid warnings like: +configure: WARNING: unrecognized options: --with-plugin-maria + +Signed-off-by: Andrei Gherzan + +Index: mariadb-5.1.67/config/ac-macros/plugins.m4 +=================================================================== +--- mariadb-5.1.67.orig/config/ac-macros/plugins.m4 ++++ mariadb-5.1.67/config/ac-macros/plugins.m4 +@@ -38,6 +38,7 @@ AC_DEFUN([_MYSQL_PLUGIN],[ + _MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1]) + m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3]) + m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4]) ++ m4_ifdef([_AC_ENABLE_IF], [_AC_ENABLE_IF([with],[plugin-$1])]) + _MYSQL_PLUGAPPEND_META([$1], $5) + ifelse(m4_bregexp(__mysql_include__,[/plug\.in$]),-1,[],[ + MYSQL_PLUGIN_DIRECTORY([$1], diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc index 7cedd9e41d..e311ed70f5 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc @@ -16,7 +16,8 @@ SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x8 file://zlib-let-libdir-configurable.patch \ file://storage-forbids-absolute-addresses-on-IA-32.patch \ file://my.cnf \ - file://mysqld.sh" + file://mysqld.sh \ + file://avoid-plugin-options-warnings.patch" SRC_URI[md5sum] = "44c331fa91943155e4796f89e17a0612" SRC_URI[sha256sum] = "33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8" -- cgit v1.2.3-54-g00ecf