summaryrefslogtreecommitdiff
path: root/BUILD/SETUP.sh
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-11-19 19:52:07 +0200
committerMonty <monty@mariadb.org>2018-12-09 20:49:05 +0200
commit84c0563a27725c92730f3e21be613f9937bdbe2f (patch)
treeed67ee1a76c9d00d66abdbbd9b25625dcbf3d40b /BUILD/SETUP.sh
parentc8250ed6c5895d9cf520acf1f44889fc2e760cb5 (diff)
downloadmariadb-git-84c0563a27725c92730f3e21be613f9937bdbe2f.tar.gz
Fixed BUILD scripts to by default work with galera and tokudb
Bascially this means that all builds with BUILD scripts are done with --with-jemalloc=NO # Required by tokudb --with-ssl # Required on OpenSuse 10.5 to get galera to work
Diffstat (limited to 'BUILD/SETUP.sh')
-rwxr-xr-xBUILD/SETUP.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index e9bede9c746..7e6f0831423 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -122,7 +122,8 @@ get_make_parallel_flag
# SSL library to use.--with-ssl will select our bundled yaSSL
# implementation of SSL. --with-ssl=yes will first try 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
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 "
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"
+# Following is to get tokudb to work
+base_configs="$base_configs --with-jemalloc=NO"
if test -d "$path/../cmd-line-utils/readline"
then