mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change BUILD scripts to use wolfss by default

Browse source
This commit is contained in:
Monty 2022-11-22 13:32:44 +02:00 committed by Sergei Petrunia
parent 0dd9ec97d0
commit 657868f5e7
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
BUILD/SETUP.sh
View file

@ -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.

2
cmake/configure.pl
View file

@ -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;