Skip to content

Commit 4eae9ee

Browse files
committed
Backport BUILD scripts from 10.4
- Fixes building with galera and tokudb - Added support for --without-wsrep BUILD script option
1 parent d0799a0 commit 4eae9ee

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

BUILD/SETUP.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ get_make_parallel_flag
122122
# SSL library to use.--with-ssl will select our bundled yaSSL
123123
# implementation of SSL. --with-ssl=yes will first try system library
124124
# 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
126127

127128
if [ "x$warning_mode" = "xpedantic" ]; then
128129
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 "
194195
base_configs="$base_configs --enable-thread-safe-client "
195196
base_configs="$base_configs --with-big-tables $maintainer_mode"
196197
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"
197200

198201
if test -d "$path/../cmd-line-utils/readline"
199202
then

cmake/configure.pl

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ sub check_compiler
145145
$cmakeargs = $cmakeargs." -DPLUGIN_".uc($1)."=".uc($2);
146146
next;
147147
}
148+
if($option =~ /without-wsrep/)
149+
{
150+
$cmakeargs = $cmakeargs." -DWITH_WSREP=OFF";
151+
next;
152+
}
148153
if($option =~ /with-zlib-dir=bundled/)
149154
{
150155
$cmakeargs = $cmakeargs." -DWITH_ZLIB=bundled";
@@ -185,6 +190,16 @@ sub check_compiler
185190
$cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF";
186191
next;
187192
}
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+
}
188203
if($option =~ /prefix=/)
189204
{
190205
$cmake_install_prefix= substr($option, 7);

0 commit comments

Comments
 (0)