diff options
| author | Monty <monty@mariadb.org> | 2016-12-30 11:23:45 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-01-11 09:18:36 +0200 |
| commit | 7567cf5aef9c21b2c8dc404cfe10b4a189851163 (patch) | |
| tree | 8ae2a2b3b29570ed4675b9c88f27a7c7da57087c | |
| parent | ea1b25046c81db8fdf59130126d57cfb42737ba5 (diff) | |
| download | mariadb-git-7567cf5aef9c21b2c8dc404cfe10b4a189851163.tar.gz | |
Fixes for using ssl with BUILD scripts.
Needed as GNUTLS can't be used by MariaDB on many systems,
like OpenSuse 13.2
| -rwxr-xr-x | BUILD/SETUP.sh | 7 | ||||
| -rw-r--r-- | cmake/configure.pl | 13 | ||||
| -rw-r--r-- | mysql-test/valgrind.supp | 10 |
3 files changed, 22 insertions, 8 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 5f5b0250088..d25b9d9d891 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -120,10 +120,9 @@ path=`dirname $0` get_make_parallel_flag # SSL library to use.--with-ssl will select our bundled yaSSL -# implementation of SSL. To use OpenSSL you will need to specify -# the location of OpenSSL headers and libs on your system. -# Ex --with-ssl=/usr -SSL_LIBRARY=--with-ssl +# implementation of SSL. --with-ssl=yes will first try system library +# then the boundled one --with-ssl=system will use the system library. +SSL_LIBRARY=--with-ssl=system if [ "x$warning_mode" = "xpedantic" ]; then warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE" diff --git a/cmake/configure.pl b/cmake/configure.pl index 68baf436c1c..c502a172a22 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -165,21 +165,26 @@ foreach my $option (@ARGV) $cmakeargs = $cmakeargs." -DWITH_LIBEVENT=bundled"; next; } - if($option =~ /with-ssl=/) + if($option =~ /with-ssl=yes/) { $cmakeargs = $cmakeargs." -DWITH_SSL=yes"; next; } - if($option =~ /with-debug/) + if($option =~ /with-ssl=system/) { - $cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF"; + $cmakeargs = $cmakeargs." -DWITH_SSL=system"; next; } - if($option =~ /with-ssl/) + if($option =~ /with-ssl$/) { $cmakeargs = $cmakeargs." -DWITH_SSL=bundled"; next; } + if($option =~ /with-debug/) + { + $cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF"; + next; + } if($option =~ /prefix=/) { $cmake_install_prefix= substr($option, 7); diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index 31b214d75f4..76c848dddad 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -1078,6 +1078,16 @@ } { + OpenSSL still reachable. + Memcheck:Leak + fun:*alloc + fun:CRYPTO_malloc + fun:sk_new + fun:SSL_COMP_get_compression_methods + fun:SSL_library_init +} + +{ libcrypto 2.2.1 leak Memcheck:Leak fun:malloc |