Commit 3efe3e26 authored by unknown's avatar unknown
Browse files

merged 


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  automerged
parents a34cb793 89001262

BUILD/FINISH.sh

+0 −6
Original line number Diff line number Diff line
@@ -2,12 +2,6 @@ cflags="$c_warnings $extra_flags" 
cxxflags="$cxx_warnings $base_cxxflags $extra_flags"

extra_configs="$extra_configs $local_infile_configs"

configure="./configure $base_configs $extra_configs"

for arg

do

  # Escape special characters so they don't confuse eval

  configure="$configure "`echo "$arg" | \

  		sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'`

done



commands="\

$make -k distclean || true

BUILD/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ EXTRA_DIST = FINISH.sh \ 
			compile-pentium-debug-max \

			compile-pentium-debug-no-bdb \

			compile-pentium-debug-openssl \

			compile-pentium-debug-yassl \

			compile-pentium-gcov \

			compile-pentium-gprof \

			compile-pentium-max \

BUILD/check-cpu

+32 −0
Original line number Diff line number Diff line
@@ -19,8 +19,23 @@ if test -r /proc/cpuinfo ; then 
  if test -z "$model_name" ; then

    model_name=`uname -m`

  fi

else

  # Fallback when there is no /proc/cpuinfo

  case "`uname -s`" in

    FreeBSD)

      cpu_family=`uname -m`;

      model_name=`sysctl -b hw.model`

      ;;

    *)

      cpu_family=`uname -m`;

      model_name="unknown";

      ;;

  esac

fi



cpu_flag=""

cpu_flag_old=""



case "$cpu_family--$model_name" in

  Alpha*EV6*)

    cpu_flag="ev6";
@@ -28,11 +43,24 @@ case "$cpu_family--$model_name" in 
  *Xeon*)

    cpu_flag="nocona";

    ;;

  *Pentium*4*Mobile*CPU*)

    cpu_flag="pentium4m";

  ;;

  *Pentium*4*CPU*)

    cpu_flag="pentium4";

    ;;

  *Pentium*III*Mobile*CPU*)

    cpu_flag="pentium3m";

  ;;

  *Pentium*III*CPU*)

    cpu_flag="pentium3";

  ;;

  *Pentium*M*pro*)

    cpu_flag="pentium-m";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

    cpu_flag_old="athlon";

    ;;

  *Athlon*)

    cpu_flag="athlon";
@@ -72,6 +100,10 @@ case "$cc_ver--$cc_verno" in 
    check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag"

    ;;

  *GCC*)

    # Fix for older compiler versions

    if test -n "$cpu_flag_old"; then

      cpu_flag="$cpu_flag_old"

    fi

    check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"

    ;;

  *)

BUILD/compile-darwin-mwcc

0 → 100755
+54 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



c_warnings=""

cxx_warnings=""

fast_cflags="-O3"

base_cxxflags="-fno-handle-exceptions"



# FIXME do we need to link static, not to depend on CodeWarrior libs?



if [ x$MODE = x ] ; then

  echo "You need to give an argument, 'standard', 'max', 'debug' or 'debug-max'"

  echo "Like: MODE=standard BUILD/compile-darwin-codewarrior"

  exit 1

else

  case $MODE in

    standard|pro-gpl)

      # FIXME pro/pro-gpl different libedit/readline

      extra_flags="$ppc_cflags $fast_cflags"

      ;;

    pro)

      # FIXME pro/pro-gpl different libedit/readline

      extra_flags="$ppc_cflags $fast_cflags"

      extra_configs="--with-libedit"

      ;;

    max)

      extra_flags="$ppc_cflags $fast_cflags"

      extra_configs="$max_configs"

      ;;

    debug)

      extra_flags="$ppc_cflags $debug_cflags"

      c_warnings="$c_warnings $debug_extra_warnings"

      cxx_warnings="$cxx_warnings $debug_extra_warnings"

      extra_configs="$debug_configs"

      ;;

    debug-max)

      extra_flags="$ppc_cflags $debug_cflags $max_cflags"

      c_warnings="$c_warnings $debug_extra_warnings"

      cxx_warnings="$cxx_warnings $debug_extra_warnings"

      extra_configs="$debug_configs $max_configs"

      ;;

    *)

      echo "You need to give an argument, 'standard', 'max', 'debug' or 'debug-max'"

      echo "Like: MODE=standard BUILD/compile-darwin-codewarrior"

      exit 1

      ;;

  esac

fi



extra_configs="$extra_configs --with-darwin-mwcc"



. "$path/FINISH.sh"

BUILD/compile-dist

+5 −0
Original line number Diff line number Diff line
@@ -18,12 +18,17 @@ autoconf 
# Default to gcc for CC and CXX

if test -z "$CXX" ; then

  export CXX=gcc

  # Set some required compile options

  if test -z "$CXXFLAGS" ; then

    export CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"

  fi

fi



if test -z "$CC" ; then

  export CC=gcc

fi





# Use ccache, if available

if ccache -V > /dev/null 2>&1

then