From 951e92b2640793e4bfe4d02b8220266945326c0d Mon Sep 17 00:00:00 2001
From: unknown <knielsen@knielsen-hq.org>
Date: Thu, 7 Jan 2010 13:02:18 +0100
Subject: Add BUILD/compile-bintar, which builds MariaDB with correct options
 for a binary tarball release.

BUILD/Makefile.am:
  Add BUILD/compile-bintar to source tarball.
BUILD/SETUP.sh:
  Move common code to separate file to enable sharing.
BUILD/compile-bintar:
  Add script to build with correct flags and ./configure options for bintar package.
BUILD/util.sh:
  Move common code to separate file to enable sharing.
---
 BUILD/util.sh | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 BUILD/util.sh

(limited to 'BUILD/util.sh')

diff --git a/BUILD/util.sh b/BUILD/util.sh
new file mode 100644
index 00000000000..63b42db1f83
--- /dev/null
+++ b/BUILD/util.sh
@@ -0,0 +1,40 @@
+# MariaDB SQL server.
+# Copyright (C) 2010 Kristian Nielsen and Monty Program AB
+#
+# 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
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# Setting cpu options.
+get_cpuopt () {
+	case "$(gcc -dumpmachine)" in
+          x86_64-*)
+                # gcc barfs on -march=... on x64
+                CPUOPT="-m64 -mtune=generic"
+                ;;
+          *)
+                # we'd use i586 to not trip up mobile/lowpower devices
+                CPUOPT="-m32 -march=i586 -mtune=generic"
+                ;;
+	esac
+	return 0
+}
+
+# Default to a parallel build, but only if AM_MAKEFLAGS is not set.
+# (So buildbots can easily disable this behaviour if required.)
+get_make_parallel_flag () {
+        if test -z "$AM_MAKEFLAGS"
+        then
+                AM_MAKEFLAGS="-j 6"
+        fi
+	return 0
+}
-- 
cgit v1.2.1


From 44d2bf540d38c63b6e2b45b1d9c2a61b2fc41024 Mon Sep 17 00:00:00 2001
From: unknown <knielsen@knielsen-hq.org>
Date: Thu, 28 Jan 2010 23:34:22 +0100
Subject: Add support in bintar build script for OpenSolaris.

---
 BUILD/util.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'BUILD/util.sh')

diff --git a/BUILD/util.sh b/BUILD/util.sh
index 63b42db1f83..c8559184013 100644
--- a/BUILD/util.sh
+++ b/BUILD/util.sh
@@ -16,6 +16,8 @@
 
 # Setting cpu options.
 get_cpuopt () {
+    case "$(uname -o)" in
+      *Linux*)
 	case "$(gcc -dumpmachine)" in
           x86_64-*)
                 # gcc barfs on -march=... on x64
@@ -26,7 +28,13 @@ get_cpuopt () {
                 CPUOPT="-m32 -march=i586 -mtune=generic"
                 ;;
 	esac
-	return 0
+	;;
+      *Solaris*)
+	# ToDo: handle 32-bit build? For now default to 64-bit.
+	CPUOPT="-D__sun -m64 -mtune=athlon64"
+	;;
+    esac
+    return 0
 }
 
 # Default to a parallel build, but only if AM_MAKEFLAGS is not set.
-- 
cgit v1.2.1