diff options
| author | Monty <monty@mariadb.org> | 2022-11-22 13:32:44 +0200 |
|---|---|---|
| committer | Sergei Petrunia <sergey@mariadb.com> | 2023-02-03 10:57:13 +0300 |
| commit | 657868f5e726e0a5e78d879e4ae50f1d3b5a8d71 (patch) | |
| tree | fd187095ceef1e170c5fe3884c2722077bbb1629 | |
| parent | 0dd9ec97d02e2823577aaaca2d8b8dc097b03921 (diff) | |
| download | mariadb-git-657868f5e726e0a5e78d879e4ae50f1d3b5a8d71.tar.gz | |
Change BUILD scripts to use wolfss by default
| -rwxr-xr-x | BUILD/SETUP.sh | 11 | ||||
| -rw-r--r-- | cmake/configure.pl | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index d990608f14e..9b3a584bbab 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -127,7 +127,7 @@ get_make_parallel_flag # implementation of SSL. --with-ssl=yes will first try system library # then the bundled one --with-ssl=system will use the system library. # We use bundled by default as this is guaranteed to work with Galera -SSL_LIBRARY=--with-ssl +SSL_LIBRARY=--with-ssl=bundled if [ "x$warning_mode" = "xpedantic" ]; then warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE" @@ -202,6 +202,7 @@ base_configs="$base_configs --with-extra-charsets=complex " base_configs="$base_configs --enable-thread-safe-client " base_configs="$base_configs --with-big-tables $maintainer_mode" base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables --with-plugin-s3=STATIC" +base_configs="$base_configs $SSL_LIBRARY" if test -d "$path/../cmd-line-utils/readline" then @@ -212,10 +213,10 @@ then fi max_plugins="--with-plugins=max" -max_no_embedded_configs="$SSL_LIBRARY $max_plugins" -max_no_qc_configs="$SSL_LIBRARY $max_plugins --without-query-cache" -max_configs="$SSL_LIBRARY $max_plugins --with-embedded-server --with-libevent --with-plugin-rocksdb=dynamic --with-plugin-test_sql_discovery=DYNAMIC --with-plugin-file_key_management=DYNAMIC --with-plugin-hashicorp_key_management=DYNAMIC" -all_configs="$SSL_LIBRARY $max_plugins --with-embedded-server --with-innodb_plugin --with-libevent" +max_no_embedded_configs="$max_plugins" +max_no_qc_configs="$max_plugins --without-query-cache" +max_configs="$max_plugins --with-embedded-server --with-libevent --with-plugin-rocksdb=dynamic --with-plugin-test_sql_discovery=DYNAMIC --with-plugin-file_key_management=DYNAMIC --with-plugin-hashicorp_key_management=DYNAMIC --with-plugin-auth_gssapi=DYNAMIC" +all_configs="$max_plugins --with-embedded-server --with-innodb_plugin --with-libevent" # # CPU and platform specific compilation flags. diff --git a/cmake/configure.pl b/cmake/configure.pl index 4085110b6fa..87099169b85 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -190,7 +190,7 @@ foreach my $option (@ARGV) $cmakeargs = $cmakeargs." -DWITH_SSL=system"; next; } - if($option =~ /with-ssl$/) + if($option =~ /with-ssl$/ || $option =~ /with-ssl=bundled/) { $cmakeargs = $cmakeargs." -DWITH_SSL=bundled"; next; |