Update BUILD scripts

- align compile-am64-debug-max and compile-amd64-debug-all with the
  'pentium' versions.
- Use system SSL by default
- Use "--with-plugin-auth_gssapi=DYNAMIC" as default for max and all builds
- all and max builds are now the same (we should probably remove 'all' at
  some point.
This commit is contained in:
Monty 2023-04-17 16:46:52 +03:00
parent 656c2e18b1
commit d6c8696724
5 changed files with 15 additions and 14 deletions

View file

@ -127,7 +127,7 @@ get_make_parallel_flag
# implementation of SSL. --with-ssl=yes will first try system library # implementation of SSL. --with-ssl=yes will first try system library
# then the bundled one --with-ssl=system will use the system library. # then the bundled one --with-ssl=system will use the system library.
# We use bundled by default as this is guaranteed to work with Galera # We use bundled by default as this is guaranteed to work with Galera
SSL_LIBRARY=--with-ssl SSL_LIBRARY=--with-ssl=system
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"
@ -202,6 +202,7 @@ 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 --with-plugin-s3=STATIC" base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables --with-plugin-s3=STATIC"
base_configs="$base_configs $SSL_LIBRARY"
if test -d "$path/../cmd-line-utils/readline" if test -d "$path/../cmd-line-utils/readline"
then then
@ -212,18 +213,17 @@ then
fi fi
max_plugins="--with-plugins=max" max_plugins="--with-plugins=max"
max_no_embedded_configs="$SSL_LIBRARY $max_plugins" max_no_embedded_configs="$max_plugins"
max_no_qc_configs="$SSL_LIBRARY $max_plugins --without-query-cache" max_no_qc_configs="$max_plugins --without-query-cache"
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" 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"
all_configs="$SSL_LIBRARY $max_plugins --with-embedded-server --with-innodb_plugin --with-libevent" all_configs="$max_configs"
# #
# CPU and platform specific compilation flags. # CPU and platform specific compilation flags.
# #
alpha_cflags="$check_cpu_cflags -Wa,-m$cpu_flag" alpha_cflags="$check_cpu_cflags -Wa,-m$cpu_flag"
amd64_cflags="$check_cpu_cflags"
amd64_cxxflags="" # If dropping '--with-big-tables', add here "-DBIG_TABLES"
pentium_cflags="$check_cpu_cflags -m32" pentium_cflags="$check_cpu_cflags -m32"
amd64_cflags="$check_cpu_cflags -m64"
pentium64_cflags="$check_cpu_cflags -m64" pentium64_cflags="$check_cpu_cflags -m64"
ppc_cflags="$check_cpu_cflags" ppc_cflags="$check_cpu_cflags"
sparc_cflags="" sparc_cflags=""

View file

@ -1,7 +1,10 @@
#! /bin/sh #! /bin/sh
path=`dirname $0` path=`dirname $0`
set -- "$@" --with-debug=full
. "$path/SETUP.sh" . "$path/SETUP.sh"
extra_flags="$amd64_cflags $debug_cflags" extra_flags="$amd64_cflags $debug_cflags"
extra_configs="$amd64_configs $debug_configs $all_configs" extra_configs="$amd64_configs $debug_configs $all_configs"
CC="$CC --pipe"
. "$path/FINISH.sh" . "$path/FINISH.sh"

View file

@ -1,7 +1,6 @@
#! /bin/sh #! /bin/sh
# Copyright (c) 2005, 2006 MySQL AB # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -14,11 +13,13 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
path=`dirname $0` path=`dirname $0`
. "$path/SETUP.sh" . "$path/SETUP.sh"
extra_flags="$amd64_cflags $debug_cflags" extra_flags="$amd64_cflags $debug_cflags"
extra_configs="$amd64_configs $debug_configs $max_configs" extra_configs="$amd64_configs $debug_configs $max_configs"
CC="$CC --pipe"
. "$path/FINISH.sh" . "$path/FINISH.sh"

View file

@ -6,7 +6,5 @@ set -- "$@" --with-debug=full
extra_flags="$pentium64_cflags $debug_cflags" extra_flags="$pentium64_cflags $debug_cflags"
extra_configs="$pentium_configs $debug_configs $all_configs" extra_configs="$pentium_configs $debug_configs $all_configs"
extra_configs="$extra_configs "
CC="$CC --pipe" CC="$CC --pipe"
. "$path/FINISH.sh" . "$path/FINISH.sh"

View file

@ -21,6 +21,5 @@ path=`dirname $0`
extra_flags="$pentium64_cflags $debug_cflags" extra_flags="$pentium64_cflags $debug_cflags"
extra_configs="$pentium_configs $debug_configs $max_configs" extra_configs="$pentium_configs $debug_configs $max_configs"
extra_configs="$extra_configs "
CC="$CC --pipe" CC="$CC --pipe"
. "$path/FINISH.sh" . "$path/FINISH.sh"