diff options
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 7 | ||||
| -rwxr-xr-x | BUILD/autorun.sh | 18 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-debug-max-no-embedded | 2 |
3 files changed, 13 insertions, 14 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index a507d30e518..1603cfadbed 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -48,10 +48,9 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch c_warnings="$global_warnings -Wunused" cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" -base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-big-tables" -max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-embedded-server --with-big-tables" -max_no_es_configs="$max_leave_isam_configs --without-isam" -max_configs="$max_no_es_configs --with-embedded-server" +base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine" +max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables" +max_configs="$base_max_configs --with-embedded-server" path=`dirname $0` . "$path/check-cpu" diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh index 8e4ef85657e..82fd1722bd0 100755 --- a/BUILD/autorun.sh +++ b/BUILD/autorun.sh @@ -1,21 +1,21 @@ #!/bin/sh # Create MySQL autotools infrastructure -aclocal || (echo "Can't execute aclocal" && exit 1) -autoheader || (echo "Can't execute autoheader" && exit 1) +die() { echo "$@"; exit 1; } + +aclocal || die "Can't execute aclocal" +autoheader || die "Can't execute autoheader" # --force means overwrite ltmain.sh script if it already exists # Added glibtoolize reference to make native OSX autotools work if [ -f /usr/bin/glibtoolize ] ; then - glibtoolize --automake --force \ - || (echo "Can't execute glibtoolize" && exit 1) + glibtoolize --automake --force || die "Can't execute glibtoolize" else - libtoolize --automake --force \ - || (echo "Can't execute libtoolize" && exit 1) + libtoolize --automake --force || die "Can't execute libtoolize" fi + # --add-missing instructs automake to install missing auxiliary files # and --force to overwrite them if they already exist -automake --add-missing --force \ - || (echo "Can't execute automake" && exit 1) -autoconf || (echo "Can't execute autoconf" && exit 1) +automake --add-missing --force || die "Can't execute automake" +autoconf || die "Can't execute autoconf" (cd storage/bdb/dist && sh s_all) (cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded index 803a6a9d6d3..dfdf7d0a5e1 100755 --- a/BUILD/compile-pentium-debug-max-no-embedded +++ b/BUILD/compile-pentium-debug-max-no-embedded @@ -6,6 +6,6 @@ path=`dirname $0` extra_flags="$pentium_cflags $debug_cflags $max_cflags" c_warnings="$c_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings" -extra_configs="$pentium_configs $debug_configs $max_no_es_configs" +extra_configs="$pentium_configs $debug_configs $base_max_configs" . "$path/FINISH.sh" |