diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2014-11-13 00:37:35 -0500 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-11-24 11:59:49 +0100 |
| commit | 7813f6d7b7a7abe70a8c8e0409f764d77af4a0b5 (patch) | |
| tree | 07ead587e6fa54fdb370130dea96923735090114 | |
| parent | 0ceb0cea6bc71f1089b97eca7bec656f50be0b86 (diff) | |
| download | meta-openembedded-7813f6d7b7a7abe70a8c8e0409f764d77af4a0b5.tar.gz | |
mariadb: Check valgrind headers only if WITH_VALGRIND is set
Changes:
- Add patch to check valgrind headers only if WITH_VALGRIND is set
- Add PACKAGECONFIG for valgrind and disable it by default
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch | 41 | ||||
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.5.39.inc | 2 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch b/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch new file mode 100644 index 0000000000..e97def6021 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From 5effba0d7d47071a3f1bca56823190d5a95bb1a6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
| 3 | Date: Wed, 12 Nov 2014 03:09:10 -0500 | ||
| 4 | Subject: [PATCH] configure.cmake: fix valgrind | ||
| 5 | |||
| 6 | Check valgrind headers only if WITH_VALGRIND is set. | ||
| 7 | |||
| 8 | mariadb uses two macros for valgrind compilations: | ||
| 9 | HAVE_valgrind - valgrind is installed and can be set by configure option -DWITH_VALGRIND | ||
| 10 | HAVE_VALGRIND - valgrind debug libraries is installed, set by auto check | ||
| 11 | |||
| 12 | We would like to set them both by the configure option so that we can use | ||
| 13 | PACKAGECONFIG to decide if valgrind is needed or not. | ||
| 14 | |||
| 15 | Upstream-Status: Inappropriate [oe specific] | ||
| 16 | |||
| 17 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
| 18 | --- | ||
| 19 | configure.cmake | 4 ++-- | ||
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/configure.cmake b/configure.cmake | ||
| 23 | index 0bd7bbe..51a098f 100644 | ||
| 24 | --- a/configure.cmake | ||
| 25 | +++ b/configure.cmake | ||
| 26 | @@ -1047,10 +1047,10 @@ MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY) | ||
| 27 | |||
| 28 | IF(WITH_VALGRIND) | ||
| 29 | SET(HAVE_valgrind 1) | ||
| 30 | + CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" | ||
| 31 | + HAVE_VALGRIND) | ||
| 32 | ENDIF() | ||
| 33 | |||
| 34 | -CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" | ||
| 35 | - HAVE_VALGRIND) | ||
| 36 | |||
| 37 | #-------------------------------------------------------------------- | ||
| 38 | # Check for IPv6 support | ||
| 39 | -- | ||
| 40 | 2.0.0 | ||
| 41 | |||
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc b/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc index 459c7ec4d5..f9909ebd00 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc | |||
| @@ -10,6 +10,7 @@ SRC_URI = "http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$ | |||
| 10 | file://fix-mysqlclient-r-version.patch \ | 10 | file://fix-mysqlclient-r-version.patch \ |
| 11 | file://my.cnf \ | 11 | file://my.cnf \ |
| 12 | file://mysqld.service \ | 12 | file://mysqld.service \ |
| 13 | file://configure.cmake-fix-valgrind.patch \ | ||
| 13 | " | 14 | " |
| 14 | 15 | ||
| 15 | SRC_URI[md5sum] = "917a807d8cf2c8ef9deedd2a89b6decd" | 16 | SRC_URI[md5sum] = "917a807d8cf2c8ef9deedd2a89b6decd" |
| @@ -38,6 +39,7 @@ EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" | |||
| 38 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" | 39 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" |
| 39 | PACKAGECONFIG_class-native = "" | 40 | PACKAGECONFIG_class-native = "" |
| 40 | PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" | 41 | PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" |
| 42 | PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITHOUT_VALGRIND=TRUE,valgrind" | ||
| 41 | 43 | ||
| 42 | # MariaDB doesn't link properly with gold | 44 | # MariaDB doesn't link properly with gold |
| 43 | # https://mariadb.atlassian.net/browse/MDEV-5982 | 45 | # https://mariadb.atlassian.net/browse/MDEV-5982 |