Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 24e2b0edc2612acefcc48414bb6f0aeb086061a9 Mon Sep 17 00:00:00 2001 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 3 | Date: Tue, 26 Feb 2019 23:57:06 -0800 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 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> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 18 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 19 | |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 20 | --- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 21 | configure.cmake | 5 ++--- |
| 22 | 1 file changed, 2 insertions(+), 3 deletions(-) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 23 | |
| 24 | diff --git a/configure.cmake b/configure.cmake |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 25 | index 3cfc4b31..d017b3b3 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 26 | --- a/configure.cmake |
| 27 | +++ b/configure.cmake |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 28 | @@ -930,10 +930,9 @@ HAVE_GCC_C11_ATOMICS) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 29 | |
| 30 | IF(WITH_VALGRIND) |
| 31 | SET(HAVE_valgrind 1) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 32 | -ENDIF() |
| 33 | - |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 34 | -CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 35 | + CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" |
| 36 | HAVE_VALGRIND_MEMCHECK_H) |
| 37 | +ENDIF() |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 38 | |
| 39 | #-------------------------------------------------------------------- |
| 40 | # Check for IPv6 support |