mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

acconfig.h

Browse source 
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?


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
BUILD/compile-pentium-debug:
  debug has different warnings
BitKeeper/etc/ignore:
  Added mysqld.S mysqld.sym to the ignore list
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?
acconfig.h:
  fix to make ENCRYPT work
configure.in:
  fixes to make CRYPT work again
This commit is contained in:
unknown 2000-12-20 00:11:49 -07:00
parent d029966f63
commit 33ae32174c
7 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bzrignore
View file

@ -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

12
BUILD/FINISH.sh
View file

@ -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

12
BUILD/SETUP.sh
View file

@ -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"
@ -37,7 +39,7 @@ else
make=make
fi
$make -k clean || true
$make -k clean || true
/bin/rm -f */.deps/*.P config.cache
aclocal; autoheader; aclocal; automake; autoconf

2
BUILD/compile-pentium-debug
View file

@ -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"

3
Docs/Makefile.am
View file

@ -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.

3
acconfig.h
View file

@ -117,6 +117,9 @@
/* POSIX sigwait */
#undef HAVE_SIGWAIT
/* crypt */
#undef HAVE_CRYPT
/* Solaris define gethostbyaddr_r with 7 arguments. glibc2 defines
this with 8 arguments */
#undef HAVE_SOLARIS_STYLE_GETHOST

6
configure.in
View file

@ -507,7 +507,9 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
# This may get things to compile even if bind-8 is installed
AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
# For crypt() on Linux
AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt, crypt))
AC_CHECK_LIB(crypt, crypt)
AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
# For compress in zlib
MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib)
@ -1259,7 +1261,7 @@ AC_CHECK_FUNCS(alarm bmove \
pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam \
pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \
pthread_condattr_create rwlock_init pthread_rwlock_rdlock \
crypt dlopen dlerror fchmod getpass getpassphrase initgroups mlockall)
dlopen dlerror fchmod getpass getpassphrase initgroups mlockall)
# Sanity check: We chould not have any fseeko symbol unless
# large_file_support=yes