From 36d8535a4fe68df5577e94a71a151a816606be2e Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Tue, 30 Sep 2008 17:57:48 -0300 Subject: 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. 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 --- BUILD/compile-solaris-amd64-forte | 7 ++++--- BUILD/compile-solaris-amd64-forte-debug | 4 ++-- BUILD/compile-solaris-sparc | 2 +- BUILD/compile-solaris-sparc-forte | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) mode change 100644 => 100755 BUILD/compile-solaris-amd64-forte diff --git a/BUILD/compile-solaris-amd64-forte b/BUILD/compile-solaris-amd64-forte old mode 100644 new mode 100755 index 63aceb16c04..03a566a0d12 --- a/BUILD/compile-solaris-amd64-forte +++ b/BUILD/compile-solaris-amd64-forte @@ -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 \ diff --git a/BUILD/compile-solaris-amd64-forte-debug b/BUILD/compile-solaris-amd64-forte-debug index 8e3ade9b429..4b0726bb3ce 100644 --- a/BUILD/compile-solaris-amd64-forte-debug +++ b/BUILD/compile-solaris-amd64-forte-debug @@ -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 diff --git a/BUILD/compile-solaris-sparc b/BUILD/compile-solaris-sparc index 5132965d766..b287baa6845 100755 --- a/BUILD/compile-solaris-sparc +++ b/BUILD/compile-solaris-sparc @@ -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 diff --git a/BUILD/compile-solaris-sparc-forte b/BUILD/compile-solaris-sparc-forte index b9fffcb7fdd..f4bf86517d1 100755 --- a/BUILD/compile-solaris-sparc-forte +++ b/BUILD/compile-solaris-sparc-forte @@ -29,7 +29,7 @@ EXTRA="-fast" # Remove comment to target current machine 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 -- cgit v1.2.1