Commit 4eae9eec authored by Monty's avatar Monty

Backport BUILD scripts from 10.4

- Fixes building with galera and tokudb
- Added support for --without-wsrep BUILD script option
parent d0799a04
...@@ -122,7 +122,8 @@ get_make_parallel_flag ...@@ -122,7 +122,8 @@ get_make_parallel_flag
# SSL library to use.--with-ssl will select our bundled yaSSL # SSL library to use.--with-ssl will select our bundled yaSSL
# implementation of SSL. --with-ssl=yes will first try system library # implementation of SSL. --with-ssl=yes will first try system library
# then the boundled one --with-ssl=system will use the system library. # then the boundled one --with-ssl=system will use the system library.
SSL_LIBRARY=--with-ssl=system # We use bundled by default as this is guaranteed to work with Galera
SSL_LIBRARY=--with-ssl
if [ "x$warning_mode" = "xpedantic" ]; then if [ "x$warning_mode" = "xpedantic" ]; then
warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE" 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,6 +195,8 @@ base_configs="$base_configs --with-extra-charsets=complex "
base_configs="$base_configs --enable-thread-safe-client " base_configs="$base_configs --enable-thread-safe-client "
base_configs="$base_configs --with-big-tables $maintainer_mode" base_configs="$base_configs --with-big-tables $maintainer_mode"
base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables" base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables"
# Following is to get tokudb to work
base_configs="$base_configs --with-jemalloc=NO"
if test -d "$path/../cmd-line-utils/readline" if test -d "$path/../cmd-line-utils/readline"
then then
......
...@@ -145,6 +145,11 @@ foreach my $option (@ARGV) ...@@ -145,6 +145,11 @@ foreach my $option (@ARGV)
$cmakeargs = $cmakeargs." -DPLUGIN_".uc($1)."=".uc($2); $cmakeargs = $cmakeargs." -DPLUGIN_".uc($1)."=".uc($2);
next; next;
} }
if($option =~ /without-wsrep/)
{
$cmakeargs = $cmakeargs." -DWITH_WSREP=OFF";
next;
}
if($option =~ /with-zlib-dir=bundled/) if($option =~ /with-zlib-dir=bundled/)
{ {
$cmakeargs = $cmakeargs." -DWITH_ZLIB=bundled"; $cmakeargs = $cmakeargs." -DWITH_ZLIB=bundled";
...@@ -185,6 +190,16 @@ foreach my $option (@ARGV) ...@@ -185,6 +190,16 @@ foreach my $option (@ARGV)
$cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF"; $cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug -DSECURITY_HARDENED=OFF";
next; next;
} }
if($option =~ /with-(.*)=(.*)/)
{
$cmakeargs = $cmakeargs. " -DWITH_" . uc($1) . "=" . uc($2);
next;
}
if($option =~ /without-(.*)=(.*)/)
{
$cmakeargs = $cmakeargs. " -DWITHOUT_" . uc($1) . "=" . uc($2);
next;
}
if($option =~ /prefix=/) if($option =~ /prefix=/)
{ {
$cmake_install_prefix= substr($option, 7); $cmake_install_prefix= substr($option, 7);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment