Skip to content

Commit 0c89eba

Browse files
montywivuvova
authored andcommitted
Change BUILD scripts to use wolfss by default
1 parent a00b5d3 commit 0c89eba

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

BUILD/SETUP.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ get_make_parallel_flag
127127
# implementation of SSL. --with-ssl=yes will first try system library
128128
# then the bundled one --with-ssl=system will use the system library.
129129
# We use bundled by default as this is guaranteed to work with Galera
130-
SSL_LIBRARY=--with-ssl
130+
SSL_LIBRARY=--with-ssl=bundled
131131

132132
if [ "x$warning_mode" = "xpedantic" ]; then
133133
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 "
202202
base_configs="$base_configs --enable-thread-safe-client "
203203
base_configs="$base_configs --with-big-tables $maintainer_mode"
204204
base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables --with-plugin-s3=STATIC"
205+
base_configs="$base_configs $SSL_LIBRARY"
205206

206207
if test -d "$path/../cmd-line-utils/readline"
207208
then
@@ -212,10 +213,10 @@ then
212213
fi
213214

214215
max_plugins="--with-plugins=max"
215-
max_no_embedded_configs="$SSL_LIBRARY $max_plugins"
216-
max_no_qc_configs="$SSL_LIBRARY $max_plugins --without-query-cache"
217-
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"
218-
all_configs="$SSL_LIBRARY $max_plugins --with-embedded-server --with-innodb_plugin --with-libevent"
216+
max_no_embedded_configs="$max_plugins"
217+
max_no_qc_configs="$max_plugins --without-query-cache"
218+
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"
219+
all_configs="$max_plugins --with-embedded-server --with-innodb_plugin --with-libevent"
219220

220221
#
221222
# CPU and platform specific compilation flags.

cmake/configure.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ sub check_compiler
190190
$cmakeargs = $cmakeargs." -DWITH_SSL=system";
191191
next;
192192
}
193-
if($option =~ /with-ssl$/)
193+
if($option =~ /with-ssl$/ || $option =~ /with-ssl=bundled/)
194194
{
195195
$cmakeargs = $cmakeargs." -DWITH_SSL=bundled";
196196
next;

0 commit comments

Comments
 (0)