diff options
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD/FINISH.sh | 9 | ||||
-rw-r--r-- | BUILD/Makefile.am | 44 | ||||
-rw-r--r-- | BUILD/SETUP.sh | 26 | ||||
-rwxr-xr-x | BUILD/compile-alpha-cxx | 10 | ||||
-rwxr-xr-x | BUILD/compile-alpha-debug | 7 | ||||
-rwxr-xr-x | BUILD/compile-ia64-debug-max | 13 | ||||
-rwxr-xr-x | BUILD/compile-pentium-debug | 2 | ||||
-rwxr-xr-x | BUILD/compile-pentium-debug-max | 2 | ||||
-rwxr-xr-x | BUILD/compile-pentium-debug-no-bdb | 2 | ||||
-rwxr-xr-x | BUILD/compile-pentium-debug-openssl | 13 | ||||
-rwxr-xr-x | BUILD/compile-pentium-gcov | 1 | ||||
-rwxr-xr-x | BUILD/compile-pentium-max | 3 | ||||
-rwxr-xr-x | BUILD/compile-pentium-mysqlfs-debug | 13 | ||||
-rwxr-xr-x | BUILD/compile-pentium-pgcc | 23 | ||||
-rwxr-xr-x | BUILD/compile-pentium-symbols | 15 | ||||
-rwxr-xr-x | BUILD/compile-pentium-valgrind-max | 28 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc | 2 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-debug | 16 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-forte | 39 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-fortre | 19 | ||||
-rwxr-xr-x | BUILD/compile-solaris-sparc-purify | 19 |
21 files changed, 244 insertions, 62 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index fbeaf1e3c68..32a4efefdfb 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -1,5 +1,6 @@ cflags="$c_warnings $extra_flags" cxxflags="$cxx_warnings $base_cxxflags $extra_flags" +extra_configs="$extra_configs $local_infile_configs" configure="./configure $base_configs $extra_configs" for arg do @@ -10,9 +11,13 @@ done commands="\ $make -k clean || true -/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache +/bin/rm -rf */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache; -aclocal && autoheader && aclocal && automake && autoconf +aclocal || (echo \"Can't execute aclocal\" && exit 1) +autoheader || (echo \"Can't execute autoheader\" && exit 1) +aclocal || (echo \"Can't execute aclocal\" && exit 1) +automake || (echo \"Can't execute automake\" && exit 1) +autoconf || (echo \"Can't execute autoconf\" && exit 1) (cd bdb/dist && sh s_all) (cd innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am new file mode 100644 index 00000000000..9c1ab24fde7 --- /dev/null +++ b/BUILD/Makefile.am @@ -0,0 +1,44 @@ +# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library 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 +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + +## Process this file with automake to create Makefile.in + +EXTRA_DIST = FINISH.sh \ + SETUP.sh \ + compile-alpha \ + compile-alpha-ccc \ + compile-alpha-cxx \ + compile-alpha-debug \ + compile-ia64-debug-max \ + compile-pentium \ + compile-pentium-debug \ + compile-pentium-debug-max \ + compile-pentium-debug-no-bdb \ + compile-pentium-debug-openssl \ + compile-pentium-gcov \ + compile-pentium-gprof \ + compile-pentium-max \ + compile-pentium-myodbc \ + compile-pentium-mysqlfs-debug \ + compile-pentium-pgcc \ + compile-solaris-sparc \ + compile-solaris-sparc-debug \ + compile-solaris-sparc-forte \ + compile-solaris-sparc-purify + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 52fe960e3a5..150f9e28b41 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -48,7 +48,7 @@ fast_cflags="-O3 -fno-omit-frame-pointer" # this is one is for someone who thinks 1% speedup is worth not being # able to backtrace reckless_cflags="-O3 -fomit-frame-pointer " -debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O1" +debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX -O1 -Wuninitialized" base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti" @@ -57,6 +57,10 @@ static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static alpha_configs="" # Not used yet pentium_configs="" sparc_configs="" +# we need local-infile in all binaries for rpl000001 +# if you need to disable local-infile in the client, write a build script +# and unset local_infile_configs +local_infile_configs="--enable-local-infile" debug_configs="--with-debug" @@ -67,4 +71,22 @@ else make=make fi -CXX=gcc +if test -z "$CXX" ; then + CXX=gcc +fi + +# If ccache (a compiler cache which reduces build time) +# (http://samba.org/ccache) is installed, use it. +# We use 'grep' and hope 'grep' will work as expected +# (returns 0 if finds lines) +if ccache -V > /dev/null 2>&1 +then + if ! (echo "$CC" | grep "ccache" > /dev/null) + then + CC="ccache $CC" + fi + if ! (echo "$CXX" | grep "ccache" > /dev/null) + then + CXX="ccache $CXX" + fi +fi diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx index 2992604644b..a342d927868 100755 --- a/BUILD/compile-alpha-cxx +++ b/BUILD/compile-alpha-cxx @@ -1,17 +1,17 @@ /bin/rm -f */.deps/*.P */*.o make -k clean /bin/rm -f */.deps/*.P */*.o -/bin/rm -f config.cache mysql-*.tar.gz +/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz aclocal; autoheader; aclocal; automake; autoconf -CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared +CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking -make -rm */.deps/* +make -j2 +find . -name ".deps" | xargs rm -r make if [ $? = 0 ] then - rm */.deps/* + find . -name ".deps" | xargs rm -r bin/mysqladmin shutdown sur make install if [ $? = 0 ] diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug index 6672027445e..60d1b9af659 100755 --- a/BUILD/compile-alpha-debug +++ b/BUILD/compile-alpha-debug @@ -1,7 +1,8 @@ +/bin/rm -f */.deps/*.P */*.o make -k clean -/bin/rm -f */.deps/*.P -/bin/rm -f config.cache +/bin/rm -f */.deps/*.P */*.o +/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz aclocal; autoheader; aclocal; automake; autoconf -CFLAGS=-O6 CXX=gcc CXXFLAGS="-O6 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-debug +CFLAGS=-O1 CC=gcc CXX=gcc CXXFLAGS="-O1 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-debug --with-extra-charsets=complex --without-extra-tools make diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max new file mode 100755 index 00000000000..9cd54de428d --- /dev/null +++ b/BUILD/compile-ia64-debug-max @@ -0,0 +1,13 @@ +gmake -k clean || true +/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache + +aclocal && autoheader && aclocal && automake && autoconf +(cd bdb/dist && sh s_all) +(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +if [ -d gemini ] +then + (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) +fi + +CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server +gmake diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug index 7d25ac4a406..d8a6b60809b 100755 --- a/BUILD/compile-pentium-debug +++ b/BUILD/compile-pentium-debug @@ -6,7 +6,7 @@ path=`dirname $0` extra_flags="$pentium_cflags $debug_cflags" c_warnings="$c_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings" -extra_configs="$pentium_configs $debug_configs" +extra_configs="$pentium_configs $debug_configs $static_link" extra_configs="$extra_configs " diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max index 993c48565b8..1684686ce8c 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 --enable-local-infile" +extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl" . "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-debug-no-bdb b/BUILD/compile-pentium-debug-no-bdb index fad58bec437..d7e70f868cc 100755 --- a/BUILD/compile-pentium-debug-no-bdb +++ b/BUILD/compile-pentium-debug-no-bdb @@ -4,6 +4,6 @@ path=`dirname $0` . "$path/SETUP.sh" extra_flags="$pentium_cflags $debug_cflags" -extra_configs="$pentium_configs $debug_configs --without-berkeley-db" +extra_configs="$pentium_configs $debug_configs --without-berkeley-db $static_link" . "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-debug-openssl b/BUILD/compile-pentium-debug-openssl new file mode 100755 index 00000000000..5de1c18a5d7 --- /dev/null +++ b/BUILD/compile-pentium-debug-openssl @@ -0,0 +1,13 @@ +#! /bin/sh + +path=`dirname $0` +. "$path/SETUP.sh" + +extra_flags="$pentium_cflags $debug_cflags" +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-debug=full --with-vio --with-openssl --without-innodb" + +. "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov index 0bc7eb2a8fa..39c0e0591e8 100755 --- a/BUILD/compile-pentium-gcov +++ b/BUILD/compile-pentium-gcov @@ -5,5 +5,6 @@ path=`dirname $0` extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage -fmessage-length=0 " extra_configs="$pentium_configs $debug_configs --disable-shared $static_link" +extra_configs="$extra_configs --with-innodb --with-berkeley-db" . "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max index 55f88ef4748..d41274d4f5e 100755 --- a/BUILD/compile-pentium-max +++ b/BUILD/compile-pentium-max @@ -8,6 +8,7 @@ extra_configs="$pentium_configs" strip=yes extra_configs="$extra_configs --with-innodb --with-berkeley-db \ - --enable-thread-safe-client" + --with-embedded-server --enable-thread-safe-client \ + --with-openssl --with-vio" . "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-mysqlfs-debug b/BUILD/compile-pentium-mysqlfs-debug new file mode 100755 index 00000000000..6643553d943 --- /dev/null +++ b/BUILD/compile-pentium-mysqlfs-debug @@ -0,0 +1,13 @@ +#! /bin/sh + +path=`dirname $0` +. "$path/SETUP.sh" + +extra_flags="$pentium_cflags $debug_cflags" +c_warnings="$c_warnings $debug_extra_warnings" +cxx_warnings="$cxx_warnings $debug_extra_warnings" +extra_configs="$pentium_configs $debug_configs $static_link" + +extra_configs="$extra_configs --with-debug=full --with-mysqlfs --without-server --without-pstack" + +. "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-pgcc b/BUILD/compile-pentium-pgcc index ee70fd2bde0..2d806009b21 100755 --- a/BUILD/compile-pentium-pgcc +++ b/BUILD/compile-pentium-pgcc @@ -1,10 +1,21 @@ AM_MAKEFLAGS="-j 2" -make -k clean +gmake -k clean || true /bin/rm -f */.deps/*.P config.cache - -aclocal; autoheader; aclocal; automake; autoconf - + +aclocal && autoheader && aclocal && automake && autoconf +(cd bdb/dist && sh s_all) +(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +if [ -d gemini ] +then + (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) +fi + export PATH=/usr/local/pgcc/bin:$PATH -CFLAGS="-O6 -mpentiumpro -fomit-frame-pointer -mstack-align-double" CXX=gcc CXXFLAGS="-O6 -mpentiumpro -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mstack-align-double" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --enable-thread-safe-client -make -j 2 +CFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O6 -mpentiumpro -fomit-frame-pointer -mstack-align-double" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O6 -fomit-frame-pointer -mpentiumpro -mstack-align-double" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static + +gmake -j 4 + +mkdir -p tmp +nm --numeric-sort sql/mysqld > tmp/mysqld.sym +objdump -d sql/mysqld > tmp/mysqld.S strip sql/mysqld diff --git a/BUILD/compile-pentium-symbols b/BUILD/compile-pentium-symbols deleted file mode 100755 index 4f63763606f..00000000000 --- a/BUILD/compile-pentium-symbols +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/sh - -path=`dirname $0` -. "$path/SETUP.sh" - -extra_flags="$pentium_cflags $fast_cflags -g" -extra_configs="$pentium_configs" - -# Use the optimized version if it exists -if test -d /usr/local/BerkeleyDB-opt/ -then - extra_configs="$extra_configs --with-berkeley-db=/usr/local/BerkeleyDB-opt/" -fi - -. "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max index d58ee723aee..0201001c959 100755 --- a/BUILD/compile-pentium-valgrind-max +++ b/BUILD/compile-pentium-valgrind-max @@ -1,13 +1,37 @@ #! /bin/sh +echo "\ +******************************************************************************** +Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with +--enable-assembler. When Valgrind detects an error involving an assembly +function (for example an uninitialized value used as an argument of an assembly +function), Valgrind will not print the stacktrace and 'valgrind +--gdb-attach=yes' will not work either. If you need a stacktrace in those cases, +you have to run BUILD/compile-pentium-valgrind-max with the --disable-assembler +argument. +******************************************************************************** +" + path=`dirname $0` . "$path/SETUP.sh" -extra_flags="$pentium_cflags $debug_cflags -DHAVE_purify" +extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -DHAVE_purify" c_warnings="$c_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings" extra_configs="$pentium_configs $debug_configs" -extra_configs="$extra_configs" +extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl" . "$path/FINISH.sh" + +echo "\ +******************************************************************************** +Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with +--enable-assembler. When Valgrind detects an error involving an assembly +function (for example an uninitialized value used as an argument of an assembly +function), Valgrind will not print the stacktrace and 'valgrind +--gdb-attach=yes' will not work either. If you need a stacktrace in those cases, +you have to run BUILD/compile-pentium-valgrind-max with the --disable-assembler +argument. +******************************************************************************** +" diff --git a/BUILD/compile-solaris-sparc b/BUILD/compile-solaris-sparc index af7c4bc5bc5..143a4b7867d 100755 --- a/BUILD/compile-solaris-sparc +++ b/BUILD/compile-solaris-sparc @@ -11,6 +11,6 @@ then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) fi -CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client +CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client gmake -j 4 diff --git a/BUILD/compile-solaris-sparc-debug b/BUILD/compile-solaris-sparc-debug new file mode 100755 index 00000000000..527f135ac62 --- /dev/null +++ b/BUILD/compile-solaris-sparc-debug @@ -0,0 +1,16 @@ +#! /bin/sh + +gmake -k clean || true +/bin/rm -f */.deps/*.P config.cache + +aclocal && autoheader && aclocal && automake && autoconf +(cd bdb/dist && sh s_all) +(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +if [ -d gemini ] +then + (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) +fi + +CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug + +gmake -j 4 diff --git a/BUILD/compile-solaris-sparc-forte b/BUILD/compile-solaris-sparc-forte new file mode 100755 index 00000000000..afd106afc67 --- /dev/null +++ b/BUILD/compile-solaris-sparc-forte @@ -0,0 +1,39 @@ +#! /bin/sh + +gmake -k clean || true +/bin/rm -f */.deps/*.P config.cache + +aclocal && autoheader && aclocal && automake && autoconf +(cd bdb/dist && sh s_all) +(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +if [ -d gemini ] +then + (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) +fi + + +# Assume Forte is installed in /opt/SUNWSpro + +PATH=/opt/SUNWspro/bin/:$PATH + +# For "optimal" code for this computer add -fast to EXTRA +# To compile 64 bit, add -xarch=v9 to EXTRA_64_BIT + +EXTRA_64_BIT="-xarch=v9" # Remove comment to get 64 bit binaries +EXTRA="-fast" # Remove comment to target current machine + +# +# The following should not need to be touched +# + +STD="-mt -D_FORTEC_ $EXTRA $EXTRA_64_BIT" +ASFLAGS="$EXTRA_64_BIT" \ +CC=cc-5.0 CFLAGS="-Xa -xstrconst $STD" \ +CXX=CC CXXFLAGS="-noex $STD" \ +./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client + +gmake -j 4 +if [ $? = 0 ] +then + make test +fi diff --git a/BUILD/compile-solaris-sparc-fortre b/BUILD/compile-solaris-sparc-fortre deleted file mode 100755 index dca0412c979..00000000000 --- a/BUILD/compile-solaris-sparc-fortre +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -gmake -k clean || true -/bin/rm -f */.deps/*.P config.cache - -aclocal && autoheader && aclocal && automake && autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) -if [ -d gemini ] -then - (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) -fi - -PATH=/opt/SUNWspro/bin/:$PATH -CC=cc CFLAGS="-Xa -fast -xO4 -native -xstrconst -mt -D_FORTREC_" \ -CXX=CC CXXFLAGS="-noex -xO4 -mt" \ -./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client - -gmake -j 4 diff --git a/BUILD/compile-solaris-sparc-purify b/BUILD/compile-solaris-sparc-purify index d73d817dd6c..71a60e45cb0 100755 --- a/BUILD/compile-solaris-sparc-purify +++ b/BUILD/compile-solaris-sparc-purify @@ -1,17 +1,30 @@ #! /bin/sh + +while test $# -gt 0 +do + case "$1" in + --debug) EXTRA_CONFIG_FLAGS=--with-debug; shift ;; + -h | --help ) cat <<EOF; exit 0 ;; +Usage: $0 [-h|-n] [configure-options] + --debug Compile with DBUG enabled +EOF + *) echo "No such option '$1'" ; exit ;; + esac +done + gmake -k clean || true /bin/rm -f */.deps/*.P config.cache - aclocal && autoheader && aclocal && automake && autoconf (cd bdb/dist && sh s_all) (cd innobase && aclocal && autoheader && aclocal && automake && autoconf) -CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-innodb +CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-innodb $EXTRA_CONFIG_FLAGS gmake -j 4 -cd sql ; rm mysqld ; +cd sql ; mv mysqld mysqld-org ; make CXXLD="purify -best-effort g++" mysqld ; mv mysqld mysqld-purify make CXXLD="quantify -best-effort g++" mysqld ; mv mysqld mysqld-quantify make CXXLD="purecov -best-effort g++" mysqld ; mv mysqld mysqld-purecov +mv mysqld-org mysqld |