Clean up BUILD script

- Removed some not old, not used build scipts
- Removed tokudb and rocksdb from 32 bit builds
  This enables one now to easily build 32 bit binaries
  on 64 bit systems

BUILD/SETUP.sh

@@ -289,6 +289,11 @@ gcov_compile_flags="-fprofile-arcs -ftest-coverage"
 gcov_compile_flags="$gcov_compile_flags -DDISABLE_TAO_ASM"
 gcov_compile_flags="$gcov_compile_flags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"
 
+#
+# The following plugins doesn't work on 32 bit systems
+disable_64_bit_plugins="--without-plugin-tokudb --without-plugin-rocksdb"
+
+
 # GCC4 needs -fprofile-arcs -ftest-coverage on the linker command line (as well
 # as on the compiler command line), and this requires setting LDFLAGS for BDB.
 

BUILD/compile-pentium

@@ -20,7 +20,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $fast_cflags"
-extra_configs="$pentium_configs"
+extra_configs="$pentium_configs $disable_64_bit_plugins"
 strip=yes
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug

@@ -19,6 +19,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs"
+extra_configs="$pentium_configs $debug_configs $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug-all

@@ -5,6 +5,6 @@ set -- "$@" --with-debug=full
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs $all_configs $error_inject --with-experimental-collations"
+extra_configs="$pentium_configs $debug_configs $all_configs $error_inject --with-experimental-collations $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug-max

@@ -19,6 +19,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs $max_configs $error_inject --with-experimental-collations"
+extra_configs="$pentium_configs $debug_configs $max_configs $error_inject --with-experimental-collations $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug-max-no-embedded

@@ -20,6 +20,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs $max_no_embedded_configs"
+extra_configs="$pentium_configs $debug_configs $max_no_embedded_configs $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-debug-openssl

@@ -19,7 +19,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs"
+extra_configs="$pentium_configs $debug_configs $disable_64_bit_plugins"
 
 extra_configs="$extra_configs  --with-debug --with-ssl=/usr"
 

BUILD/compile-pentium-debug-wsrep

@@ -7,6 +7,6 @@ set -- "$@" --with-debug=full
 extra_flags="$pentium_cflags $debug_cflags -g -O0 $wsrep_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs $wsrep_configs --with-wsrep"
+extra_configs="$pentium_configs $debug_configs $wsrep_configs --with-wsrep $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-gcov

@@ -40,6 +40,6 @@ export LDFLAGS="$gcov_link_flags"
 extra_flags="$pentium_cflags $debug_cflags $max_cflags $gcov_compile_flags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs $gcov_configs $max_configs"
+extra_configs="$pentium_configs $debug_configs $gcov_configs $max_configs $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-gprof

@@ -19,6 +19,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $gprof_compile_flags"
-extra_configs="$pentium_configs $debug_configs $gprof_link_flags"
+extra_configs="$pentium_configs $debug_configs $gprof_link_flags $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-icc

@@ -35,6 +35,6 @@ extra_flags="$fast_cflags -unroll2 -ip -mp -restrict"
 # icpc: error: problem during multi-file optimization compilation (code 1)
 extra_flags="$extra_flags -no-ipo"
 base_cxxflags="-fno-exceptions -fno-rtti"
-extra_configs="$pentium_configs $static_link"
+extra_configs="$pentium_configs $static_link $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-max

@@ -20,6 +20,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $fast_cflags -g"
-extra_configs="$pentium_configs $max_configs"
+extra_configs="$pentium_configs $max_configs $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-valgrind-max

@@ -33,6 +33,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
-extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs $disable_64_bit_plugins"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-wsrep

@@ -4,7 +4,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $fast_cflags $wsrep_cflags"
-extra_configs="$pentium_configs $wsrep_configs --with-wsrep"
+extra_configs="$pentium_configs $wsrep_configs --with-wsrep $disable_64_bit_plugins"
 
 #strip=yes