From 33ae32174c403ea1c6e38dd348e6bad9a608fe53 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 20 Dec 2000 00:11:49 -0700 Subject: [PATCH] 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? 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 --- .bzrignore | 2 ++ BUILD/FINISH.sh | 12 ++++++++++-- BUILD/SETUP.sh | 12 +++++++----- BUILD/compile-pentium-debug | 2 ++ Docs/Makefile.am | 3 ++- acconfig.h | 3 +++ configure.in | 6 ++++-- 7 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.bzrignore b/.bzrignore index c5f82922101..47b47611d1d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -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 diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 625802f78cb..02deb67bd25 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -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 diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 37c3dc2ea37..e778fc34ceb 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -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 diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug index 37381cc47df..094c4e9ca86 100755 --- a/BUILD/compile-pentium-debug +++ b/BUILD/compile-pentium-debug @@ -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" diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 5593f495bf9..ce5fbd263c6 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -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. diff --git a/acconfig.h b/acconfig.h index e1373fa17f0..986bf90fd42 100644 --- a/acconfig.h +++ b/acconfig.h @@ -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 diff --git a/configure.in b/configure.in index cfd8e8e20f6..1d50d48a8a8 100644 --- a/configure.in +++ b/configure.in @@ -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