File tree Expand file tree Collapse file tree 2 files changed +19
-1
lines changed Expand file tree Collapse file tree 2 files changed +19
-1
lines changed Original file line number Diff line number Diff line change @@ -122,7 +122,8 @@ get_make_parallel_flag
122
122
# SSL library to use.--with-ssl will select our bundled yaSSL
123
123
# implementation of SSL. --with-ssl=yes will first try system library
124
124
# then the boundled one --with-ssl=system will use the system library.
125
- SSL_LIBRARY=--with-ssl=system
125
+ # We use bundled by default as this is guaranteed to work with Galera
126
+ SSL_LIBRARY=--with-ssl
126
127
127
128
if [ " x$warning_mode " = " xpedantic" ]; then
128
129
warnings=" -W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
@@ -194,6 +195,8 @@ base_configs="$base_configs --with-extra-charsets=complex "
194
195
base_configs=" $base_configs --enable-thread-safe-client "
195
196
base_configs=" $base_configs --with-big-tables $maintainer_mode "
196
197
base_configs=" $base_configs --with-plugin-aria --with-aria-tmp-tables"
198
+ # Following is to get tokudb to work
199
+ base_configs=" $base_configs --with-jemalloc=NO"
197
200
198
201
if test -d " $path /../cmd-line-utils/readline"
199
202
then
Original file line number Diff line number Diff line change @@ -145,6 +145,11 @@ sub check_compiler
145
145
$cmakeargs = $cmakeargs ." -DPLUGIN_" .uc ($1 )." =" .uc ($2 );
146
146
next ;
147
147
}
148
+ if ($option =~ / without-wsrep/ )
149
+ {
150
+ $cmakeargs = $cmakeargs ." -DWITH_WSREP=OFF" ;
151
+ next ;
152
+ }
148
153
if ($option =~ / with-zlib-dir=bundled/ )
149
154
{
150
155
$cmakeargs = $cmakeargs ." -DWITH_ZLIB=bundled" ;
@@ -185,6 +190,16 @@ sub check_compiler
185
190
$cmakeargs = $cmakeargs ." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF" ;
186
191
next ;
187
192
}
193
+ if ($option =~ / with-(.*)=(.*)/ )
194
+ {
195
+ $cmakeargs = $cmakeargs . " -DWITH_" . uc ($1 ) . " =" . uc ($2 );
196
+ next ;
197
+ }
198
+ if ($option =~ / without-(.*)=(.*)/ )
199
+ {
200
+ $cmakeargs = $cmakeargs . " -DWITHOUT_" . uc ($1 ) . " =" . uc ($2 );
201
+ next ;
202
+ }
188
203
if ($option =~ / prefix=/ )
189
204
{
190
205
$cmake_install_prefix = substr ($option , 7);
You can’t perform that action at this time.
0 commit comments