Commit 3c06a414 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

acconfig.h 

    fix to make ENCRYPT work
BUILD/compile-pentium-debug
    debug has different warnings
BUILD/FINISH.sh
    save symbol table and dissassembled code with symobls available before strip
    use $do_make for make decision instead of $make to avoid conflict
BUILD/SETUP.sh
    export AM_MAKEFLAGS
    fast is now -fno-omit-frame-pointer, the opposite is now called 
    reckless
configure.in
    fixes to make CRYPT work again
Docs/Makefile.am
    hack to avoid rebuilding the manual on make clean -why does
    Makefile depend on $BUILD_SOURCES, and do we even need BUILD_SOURCES?
parent e0f3ef91

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -179,3 +179,5 @@ libmysql_r/conf_to_src 
mysql-test/install_test_db

mysql-test/mysql-test-run

BitKeeper/tmp/gone

mysqld.S

mysqld.sym

BUILD/FINISH.sh

+10 −2
Original line number Diff line number Diff line
@@ -8,5 +8,13 @@ done 


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



test "$make" = no || $make $AM_MAKEFLAGS

test -z "$strip" || strip mysqld
 
if [ "x$do_make" = "xno" ] ; then

 exit 0

fi



$make $AM_MAKEFLAGS

if [ "x$strip" = "xyes" ]; then

  nm --numeric-sort sql/mysqld  > mysqld.sym

  objdump -d sql/mysqld > mysqld.S 

  strip sql/mysqld

fi

BUILD/SETUP.sh

+7 −5
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@ fi 


set -e	# exit on error



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

export AM_MAKEFLAGS="-j 4"    # 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"

global_warnings="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"

debug_extra_warnings="-Wuninitialized"

c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
@@ -19,8 +20,9 @@ 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"

fast_cflags="-O6 -fno-omit-frame-pointer"

reckless_cflags="-O6 -fomit-frame-pointer"

debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O2"



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

BUILD/compile-pentium-debug

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



extra_flags="$pentium_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



. "$path/FINISH.sh"

Docs/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ all: $(targets) txt_files 
txt_files:		../INSTALL-SOURCE ../COPYING ../COPYING.LIB \

			../MIRRORS INSTALL-BINARY



CLEAN_FILES:		manual.ps

CLEAN_FILES:		$(BUILD_SOURCES)

	touch $(BUILD_SOURCES)



# The PostScript and PDF version are so big that they are not included in the

# standard distribution. It is available for download from the home page.