[oe-commits] Kai Kang : mariadb: update for packgeconfig valgrind

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 4c74014bda64959f46b8017d69f939067a3ff486
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=4c74014bda64959f46b8017d69f939067a3ff486

Author: Kai Kang <kai.kang at windriver.com>
Date:   Tue Jul  7 16:01:55 2015 +0800

mariadb: update for packgeconfig valgrind

When 'valgrind' is not in PACKAGECONFIG, 'WITHOUT_VALGRIND' is passed to
cmake but it is not a valid cmake macro. Warning messages show in
log.do_configure:

CMake Warning:
  Manually-specified variables were not used by the project:
    WITHOUT_VALGRIND

Use -DWITH_VALGRIND=FALSE instead.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/mysql/mariadb.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index 955402a..d2418e7 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -41,7 +41,7 @@ EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
 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[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind"
 PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit"
 PACKAGECONFIG[krb5] = ", ,krb5"