From 77bba943cb0f51d96acd92e90f38281e9b3f52d5 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Thu, 13 Jan 2005 09:05:23 -0800
Subject: [PATCH] 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
---
 BUILD/SETUP.sh                              |  8 ++++++++
 BUILD/compile-amd64-debug-max               | 12 ++++++++++++
 BUILD/compile-amd64-max                     | 12 ++++++++++++
 BUILD/compile-pentium-debug-max             |  2 +-
 BUILD/compile-pentium-debug-max-no-embedded |  2 +-
 BUILD/compile-pentium-max                   |  4 +---
 BUILD/compile-pentium-valgrind-max          |  2 +-
 BUILD/compile-ppc-debug-max                 |  2 +-
 BUILD/compile-ppc-max                       |  4 +---
 9 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100755 BUILD/compile-amd64-debug-max
 create mode 100755 BUILD/compile-amd64-max

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 5f4233b837..9e2095cecf 100644
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -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=""
diff --git a/BUILD/compile-amd64-debug-max b/BUILD/compile-amd64-debug-max
new file mode 100755
index 0000000000..466bea7317
--- /dev/null
+++ b/BUILD/compile-amd64-debug-max
@@ -0,0 +1,12 @@
+#! /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"
diff --git a/BUILD/compile-amd64-max b/BUILD/compile-amd64-max
new file mode 100755
index 0000000000..4a26085947
--- /dev/null
+++ b/BUILD/compile-amd64-max
@@ -0,0 +1,12 @@
+#! /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"
diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max
index 8894782050..6487c094ce 100755
--- a/BUILD/compile-pentium-debug-max
+++ b/BUILD/compile-pentium-debug-max
@@ -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"
diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded
index 4554e38fdc..f7a9d966d6 100755
--- a/BUILD/compile-pentium-debug-max-no-embedded
+++ b/BUILD/compile-pentium-debug-max-no-embedded
@@ -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"
diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max
index caf657a204..de37f28582 100755
--- a/BUILD/compile-pentium-max
+++ b/BUILD/compile-pentium-max
@@ -7,8 +7,6 @@ extra_flags="$pentium_cflags $fast_cflags -g"
 extra_configs="$pentium_configs"
 #strip=yes
 
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max
index fd9543163d..322b073548 100755
--- a/BUILD/compile-pentium-valgrind-max
+++ b/BUILD/compile-pentium-valgrind-max
@@ -9,7 +9,7 @@ cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
 # We want to test isam when building with valgrind
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_configs="$extra_configs $max_leave_isam_configs --with-isam"
 
 . "$path/FINISH.sh"
 
diff --git a/BUILD/compile-ppc-debug-max b/BUILD/compile-ppc-debug-max
index 9d67b46601..004e821d72 100755
--- a/BUILD/compile-ppc-debug-max
+++ b/BUILD/compile-ppc-debug-max
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_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"
diff --git a/BUILD/compile-ppc-max b/BUILD/compile-ppc-max
index f7193eb8ac..632db7216e 100755
--- a/BUILD/compile-ppc-max
+++ b/BUILD/compile-ppc-max
@@ -6,8 +6,6 @@ path=`dirname $0`
 extra_flags="$ppc_cflags $fast_cflags -g"
 #strip=yes
 
-extra_configs="$extra_configs --with-innodb --with-berkeley-db \
-	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_configs="$extra_configs $max_configs"
 
 . "$path/FINISH.sh"
-- 
2.30.9