Commit 26e0a5c5 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

parents 6adc34bd b0658731

BUILD/FINISH.sh

+3 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ done 


commands="\

$make -k clean || true 

/bin/rm -f */.deps/*.P config.cache

/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)
@@ -20,7 +20,8 @@ then 
   (cd gemini && aclocal && autoheader && aclocal && automake && autoconf)

fi



CFLAGS=\"$cflags\" CXX=$CXX CXXFLAGS=\"$cxxflags\" $configure"

CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" \

$configure"



if [ -z "$just_configure" ]

then

BUILD/SETUP.sh

+5 −2
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O1" 


base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"



base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static"

base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client"

static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"

alpha_configs=""	# Not used yet

pentium_configs=""

sparc_configs=""
@@ -68,7 +69,9 @@ fi 


if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1

then

  CXX=c++

  CXX="gcc -DUSE_MYSYS_NEW"

  CXXLDFLAGS="-Wl,--defsym -Wl,__cxa_pure_virtual=0"

else

  CXX=gcc

  CXXLDFLAGS=""

fi

BUILD/compile-alpha

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ path=`dirname $0` 
. "$path/SETUP.sh"



extra_flags="$alpha_cflags $fast_cflags"

extra_configs="$alpha_configs"

extra_configs="$alpha_configs $static_link"



. "$path/FINISH.sh"

BUILD/compile-pentium

+1 −3
Original line number Diff line number Diff line
@@ -4,9 +4,7 @@ path=`dirname $0` 
. "$path/SETUP.sh"



extra_flags="$pentium_cflags $fast_cflags"

extra_configs="$pentium_configs"

extra_configs="$pentium_configs $static_link"

strip=yes



extra_configs="$extra_configs"



. "$path/FINISH.sh"

BUILD/compile-pentium-debug-max

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

extra_configs="$extra_configs --with-berkeley-db --with-innodb --enable-local-infile"



. "$path/FINISH.sh"