bzr commit into mysql-5.1 branch (davi:2748) Bug#38727

[Davi Arnaut]

# At a local mysql-5.1 repository of davi

 2748 Davi Arnaut	2008-09-30
      Bug#38727: BUILD/compile-solaris-* scripts should compile MySQL with libmtmalloc
      
      Link with mtmalloc on Solaris as it is done in our release builds.
      Replace deprecated flag with the newer option as already done in
      other scripts.
modified:
  BUILD/compile-solaris-amd64-forte*
  BUILD/compile-solaris-amd64-forte-debug
  BUILD/compile-solaris-sparc
  BUILD/compile-solaris-sparc-forte

per-file messages:
  BUILD/compile-solaris-amd64-forte
    Link to mtmalloc and replace deprecated flag.
  BUILD/compile-solaris-amd64-forte-debug
    Replace deprecated flag.
  BUILD/compile-solaris-sparc
    Link to mtmalloc.
  BUILD/compile-solaris-sparc-forte
    Link to mtmalloc
=== modified file 'BUILD/compile-solaris-amd64-forte' (properties changed: -x to +x)
--- a/BUILD/compile-solaris-amd64-forte	2007-11-10 10:03:07 +0000
+++ b/BUILD/compile-solaris-amd64-forte	2008-09-30 20:57:48 +0000
@@ -7,22 +7,23 @@ path=`dirname $0`
 . "$path/autorun.sh"
 
 # For "optimal" code for this computer add -fast to EXTRA
-# To compile 64 bit, add -xarch=v9 to EXTRA_64_BIT
+# To compile 64 bit, add -m64 to EXTRA_64_BIT
 
-EXTRA_64_BIT="-xarch=amd64"
+EXTRA_64_BIT="-m64"
 EXTRA="-fast"
 
 #
 # The following should not need to be touched
 #
 
-export CC CXX CFLAGS CXXFLAGS
+export CC CXX CFLAGS CXXFLAGS LIBS
 STD="-g -mt -D_FORTEC_ $EXTRA $EXTRA_64_BIT"
 ASFLAGS="$EXTRA_64_BIT"
 CC=cc-5.0
 CFLAGS="-Xa -xstrconst $STD"
 CXX=CC
 CXXFLAGS="-noex $STD"
+LIBS=-lmtmalloc
 ./configure \
     --prefix=/usr/local/mysql \
     --localstatedir=/usr/local/mysql/data \

=== modified file 'BUILD/compile-solaris-amd64-forte-debug'
--- a/BUILD/compile-solaris-amd64-forte-debug	2007-11-10 10:03:07 +0000
+++ b/BUILD/compile-solaris-amd64-forte-debug	2008-09-30 20:57:48 +0000
@@ -6,8 +6,8 @@ gmake -k clean || true
 path=`dirname $0`
 . "$path/autorun.sh"
 
-# To compile 64 bit, add -xarch=amd64 to EXTRA_64_BIT
-EXTRA_64_BIT="-xarch=amd64"
+# To compile 64 bit, add -m64 to EXTRA_64_BIT
+EXTRA_64_BIT="-m64"
 
 # For "optimal" code for this computer add -fast to EXTRA. Note that
 # this causes problem with debugging the program since -fast implies

=== modified file 'BUILD/compile-solaris-sparc'
--- a/BUILD/compile-solaris-sparc	2007-02-23 11:13:55 +0000
+++ b/BUILD/compile-solaris-sparc	2008-09-30 20:57:48 +0000
@@ -9,6 +9,6 @@ PATH=$PATH:/usr/ccs/bin:/usr/local/bin
 path=`dirname $0`
 . "$path/autorun.sh"
 
-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
+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" LIBS="-lmtmalloc" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client
 
 make -j 4

=== modified file 'BUILD/compile-solaris-sparc-forte'
--- a/BUILD/compile-solaris-sparc-forte	2007-08-13 13:11:25 +0000
+++ b/BUILD/compile-solaris-sparc-forte	2008-09-30 20:57:48 +0000
@@ -29,7 +29,7 @@ EXTRA="-fast"			# Remove comment to targ
 
 STD="-mt -D_FORTEC_ $EXTRA $EXTRA_64_BIT"
 CC=cc-5.0 CFLAGS="-Xa -xstrconst $STD" \
-CXX=CC CXXFLAGS="-noex $STD" \
+CXX=CC CXXFLAGS="-noex $STD" LIBS="-lmtmalloc" \
 ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --prefix=$PREFIX
 
 make -j 4