Commit 77bba943 authored by unknown's avatar unknown
Browse files

Put flags for -max building in BUILD/SETUP.sh so they are consistent across 

all architectures, and in sync with the flags used to build the MySQL Max
packages. Also back-port AMD64 build scripts from 5.0.


BUILD/SETUP.sh:
  Add $max_configs (and variants) and amd64_*
BUILD/compile-pentium-debug-max:
  Use $max_configs
BUILD/compile-pentium-debug-max-no-embedded:
  Use $max_no_es_configs
BUILD/compile-pentium-max:
  Use $max_configs
BUILD/compile-pentium-valgrind-max:
  Use $max_leave_isam_configs
BUILD/compile-ppc-debug-max:
  Use $max_configs
BUILD/compile-ppc-max:
  Use $max_configs
parent a3d3aef1

BUILD/SETUP.sh

+8 −0
Original line number Diff line number Diff line
@@ -41,7 +41,13 @@ 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-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"

max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"

max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"



alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

amd64_cflags="-DBIG_TABLES"

pentium_cflags="-mcpu=pentiumpro"

ppc_cflags="-mpowerpc -mcpu=powerpc"

sparc_cflags=""
@@ -55,9 +61,11 @@ reckless_cflags="-O3 -fomit-frame-pointer " 
debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"



base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

amd64_cxxflags="-DBIG_TABLES"



base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"

static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"

amd64_configs=""

alpha_configs=""	# Not used yet

pentium_configs=""

sparc_configs=""

BUILD/compile-amd64-debug-max

0 → 100755
+12 −0
Original line number Diff line number Diff line 
#! /bin/sh

path=`dirname $0`

. "$path/SETUP.sh"

base_cxxflags="$amd64_cxxflags $base_cxxflags"

extra_flags="$amd64_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$amd64_configs $debug_configs"



extra_configs="$extra_configs $max_configs"



. "$path/FINISH.sh"

BUILD/compile-amd64-max

0 → 100755
+12 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"

base_cxxflags="$amd64_cxxflags $base_cxxflags"

extra_flags="$amd64_cflags $fast_cflags -g"

extra_configs="$amd64_configs"

#strip=yes



extra_configs="$extra_configs $max_configs"



. "$path/FINISH.sh"

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" 
cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-embedded-server --with-openssl --with-raid --with-vio --with-ndbcluster"

extra_configs="$extra_configs $max_configs"



. "$path/FINISH.sh"

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

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" 
cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-openssl --with-raid"

extra_configs="$extra_configs $max_no_es_configs"



. "$path/FINISH.sh"