Commit 66a3dbce authored by Mats Kindahl's avatar Mats Kindahl
Browse files

Merging with 5.1-5.1.29-rc.

parents 3337923c a5dee74d

BUILD/compile-solaris-amd64-forte

100644 → 100755
+4 −3
Original line number Diff line number Diff line
@@ -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 \

BUILD/compile-solaris-amd64-forte-debug

+2 −2
Original line number Diff line number Diff line
@@ -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

BUILD/compile-solaris-sparc

+1 −1
Original line number Diff line number Diff line
@@ -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

BUILD/compile-solaris-sparc-forte

+1 −1
Original line number Diff line number Diff line
@@ -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

CMakeLists.txt

+6 −8
Original line number Diff line number Diff line
@@ -108,18 +108,18 @@ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") 
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805")

SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

# Disable warnings in Visual Studio 8 and above

IF(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")

    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996")

    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996")

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

   CMAKE_GENERATOR MATCHES "Visual Studio 8")

ENDIF(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")



# Settings for Visual Studio 7 and above.  

IF(MSVC)

    # replace /MDd with /MTd

    STRING(REPLACE "/MD"  "/MT"  CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})

    STRING(REPLACE "/MD"  "/MT"  CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
@@ -149,9 +149,7 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
    IF(NOT tmp_manifest)

        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")

    ENDIF(NOT tmp_manifest)



ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

      CMAKE_GENERATOR MATCHES "Visual Studio 8")

ENDIF(MSVC)



IF(WIN32)

  ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")