Commit 1154dace authored by tim@cane.mysql.fi's avatar tim@cane.mysql.fi
Browse files

Merge

parents 8dc9ddf9 70d4d0ba
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@
.gdb_history
.libs
.o
db-*.*.*
BitKeeper/etc/config
BitKeeper/etc/csets
BitKeeper/etc/csets-in

BUILD/FINISH.sh

0 → 100644
+8 −0
Original line number Diff line number Diff line
cflags="$c_warnings $extra_flags"
cxxflags="$cxx_warnings $base_cxxflags $extra_flags"
configure="./configure $base_configs $extra_configs"

CFLAGS="$cflags" CXX=gcc CXXFLAGS="$cxxflags" eval "$configure"

test "$make" = no || $make $AM_MAKEFLAGS
test -z "$strip" || strip mysqld

BUILD/SETUP.sh

0 → 100644
+43 −0
Original line number Diff line number Diff line
if ! test -f sql/mysqld.cc; then
  echo "You must run this script from the MySQL top-level directory"
  exit 1
fi

set -e	# exit on error

AM_MAKEFLAGS="-j4"    # XXX: auto-make uses this variable - export it???

# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
# The following warning flag will give too many warnings:
# -Wshadow -Wunused  -Winline (The later isn't usable in C++ as
# __attribute()__ doesn't work with gnu C++)
global_warnings="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
c_warnings="$global_warnings -Wunused"
cxx_warnings="$global_warnings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# not used yet
pentium_cflags="-mpentiumpro"
sparc_cflags=""

fast_cflags="-O6 -fomit-frame-pointer"
debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -O2"

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 --disable-shared"
alpha_configs=""	# not used yet
pentium_configs=""
sparc_configs=""

debug_configs="--with-debug"

if gmake --version > /dev/null 2>&1; then
  make=gmake
else
  make=make
fi

$make -k clean || true
/bin/rm -f */.deps/*.P config.cache

aclocal; autoheader; aclocal; automake; autoconf
+8 −6
Original line number Diff line number Diff line
make -k clean
/bin/rm -f */.deps/*.P */*.o
/bin/rm -f config.cache
aclocal; autoheader; aclocal; automake; autoconf
#! /bin/sh

CFLAGS="-O6 -fomit-frame-pointer -mcpu=ev6 -Wa,-mev6" CXX=gcc CXXFLAGS="-O6 -mcpu=ev6 -Wa,-mev6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex
make
path=`dirname $0`
. "$path/SETUP.sh"

extra_flags="$alpha_cflags $fast_cflags"
extra_configs="$alpha_configs"

. "$path/FINISH.sh"
+8 −7
Original line number Diff line number Diff line
AM_MAKEFLAGS="-j 2"
make -k clean
/bin/rm -f */.deps/*.P config.cache
#! /bin/sh

aclocal; autoheader; aclocal; automake; autoconf
path=`dirname $0`
. "$path/SETUP.sh"

CFLAGS="-O6 -mpentiumpro -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -mpentiumpro -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./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
strip sql/mysqld
extra_flags="$pentium_cflags $fast_cflags"
extra_configs="$pentium_configs"
strip=yes

. "$path/FINISH.sh"
Loading