From de0d39c4f762397b36a0399cfda039aecf78050a Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Sun, 7 Feb 1999 22:35:56 +0000 Subject: Cleanups: - don't pollute CFLAGS with extra optimizer flags - remove part of patch-ac which forces -pthread instead of -lc_r (was included in the main distribution) - don't name freebsd version in mit-pthreads/config/configure explicitly. settings work for 2.*, 3.* and 4.*. --- databases/mysql322-client/Makefile | 12 ++++--- databases/mysql322-server/Makefile | 12 ++++--- databases/mysql322-server/files/patch-ac | 17 ++++++++-- databases/mysql322-server/files/patch-ag | 41 ++++++++++++++++-------- databases/mysql323-client/Makefile | 12 ++++--- databases/mysql323-server/Makefile | 12 ++++--- databases/mysql323-server/files/patch-ag | 41 ++++++++++++++++-------- databases/mysql40-client/Makefile | 12 ++++--- databases/mysql40-server/Makefile | 12 ++++--- databases/mysql40-server/files/patch-configure | 41 ++++++++++++++++-------- databases/mysql41-client/Makefile | 12 ++++--- databases/mysql41-server/Makefile | 12 ++++--- databases/mysql41-server/files/patch-configure | 41 ++++++++++++++++-------- databases/mysql50-client/Makefile | 12 ++++--- databases/mysql50-server/Makefile | 12 ++++--- databases/mysql50-server/files/patch-configure | 41 ++++++++++++++++-------- databases/mysql51-client/Makefile | 12 ++++--- databases/mysql51-server/Makefile | 12 ++++--- databases/mysql51-server/files/patch-configure | 41 ++++++++++++++++-------- databases/mysql54-client/Makefile | 12 ++++--- databases/mysql54-server/Makefile | 12 ++++--- databases/mysql54-server/files/patch-configure | 41 ++++++++++++++++-------- databases/mysql55-client/Makefile | 12 ++++--- databases/mysql55-server/Makefile | 12 ++++--- databases/mysql55-server/files/patch-configure | 41 ++++++++++++++++-------- databases/mysql60-client/Makefile | 12 ++++--- databases/mysql60-server/Makefile | 12 ++++--- databases/mysql60-server/files/patch-configure | 41 ++++++++++++++++-------- databases/percona55-client/Makefile | 12 ++++--- databases/percona55-server/Makefile | 12 ++++--- databases/percona55-server/files/patch-configure | 41 ++++++++++++++++-------- 31 files changed, 434 insertions(+), 233 deletions(-) (limited to 'databases') diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql322-client/Makefile +++ b/databases/mysql322-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql322-server/Makefile +++ b/databases/mysql322-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql322-server/files/patch-ac b/databases/mysql322-server/files/patch-ac index 5210c9a9582d..6cbb8431c9cd 100644 --- a/databases/mysql322-server/files/patch-ac +++ b/databases/mysql322-server/files/patch-ac @@ -1,11 +1,22 @@ --- mit-pthreads/config/configure.orig Tue Mar 10 10:11:25 1998 -+++ mit-pthreads/config/configure Tue Sep 1 10:57:21 1998 -@@ -1280,7 +1280,7 @@ ++++ mit-pthreads/config/configure Thu Feb 4 23:02:41 1999 +@@ -692,10 +692,6 @@ + echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +- elif test $ac_cv_prog_cc_g = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-O2" + fi + else + GCC= +@@ -1280,7 +1276,7 @@ m68*-*-netbsd*) name=m68000-netbsd ;; - i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.* | i386-*-freebsd4.*) ++ i386-*-freebsd*) name=i386-freebsd-2.0 sysincludes=freebsd-2.0 except="fork lseek ftruncate sigsuspend sigprocmask" diff --git a/databases/mysql322-server/files/patch-ag b/databases/mysql322-server/files/patch-ag index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/mysql322-server/files/patch-ag +++ b/databases/mysql322-server/files/patch-ag @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql323-client/Makefile +++ b/databases/mysql323-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql323-server/files/patch-ag b/databases/mysql323-server/files/patch-ag index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/mysql323-server/files/patch-ag +++ b/databases/mysql323-server/files/patch-ag @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql40-client/Makefile +++ b/databases/mysql40-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/mysql40-server/files/patch-configure +++ b/databases/mysql40-server/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql41-client/Makefile +++ b/databases/mysql41-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/mysql41-server/files/patch-configure +++ b/databases/mysql41-server/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql50-client/Makefile +++ b/databases/mysql50-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/mysql50-server/files/patch-configure +++ b/databases/mysql50-server/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/mysql51-server/files/patch-configure +++ b/databases/mysql51-server/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql54-client/Makefile +++ b/databases/mysql54-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/mysql54-server/files/patch-configure +++ b/databases/mysql54-server/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/mysql55-server/files/patch-configure +++ b/databases/mysql55-server/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql60-client/Makefile +++ b/databases/mysql60-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/mysql60-server/files/patch-configure +++ b/databases/mysql60-server/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index d0cf81ba998d..7caf58be1ccf 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach # -# $Id: Makefile,v 1.39 1999/01/05 23:43:27 dirk Exp $ +# $Id: Makefile,v 1.40 1999/02/01 16:52:15 dirk Exp $ # DISTNAME= mysql-3.22.15-gamma @@ -28,14 +28,15 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-bench CONFIGURE_ENV+= PERL=${PERL5} \ PERL5=${PERL5} \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + CXXFLAGS="${CFLAGS}" .include .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -CONFIGURE_ARGS+= --with-named-thread-libs=-lc_r +CONFIGURE_ARGS+= --with-mit-threads=no .else -CONFIGURE_ARGS+= --with-mit-threads +CONFIGURE_ARGS+= --with-mit-threads=yes .endif .if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 @@ -44,7 +45,8 @@ pre-fetch: @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." @${ECHO} "Warning: There are still some bugs in libc_r which prevent" - @${ECHO} " 'mysqladmin shutdown' from working properly." + @${ECHO} " 'mysqladmin shutdown' from working properly and" + @${ECHO} " killing mysqld might not work." @${ECHO} .elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure index 1d3aac9b1479..26a6ce1c6fc7 100644 --- a/databases/percona55-server/files/patch-configure +++ b/databases/percona55-server/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig Wed Nov 4 23:00:15 1998 -+++ configure Mon Nov 30 23:35:59 1998 -@@ -2197,30 +2197,7 @@ +--- configure.orig Wed Jan 27 14:41:59 1999 ++++ configure Thu Feb 4 19:50:16 1999 +@@ -2199,30 +2199,7 @@ echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2199: checking "how to check if pid exists"" >&5 + echo "configure:2201: checking "how to check if pid exists"" >&5 PS=$ac_cv_path_PS -# Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null @@ -32,12 +32,27 @@ echo "$ac_t"""$FIND_PROC"" 1>&6 # Check if a pid is valid -@@ -3484,7 +3461,7 @@ - echo "configure:3485: checking "named thread libs:"" >&5 - if test "$with_named_thread" != "no" - then -- LIBS="$LIBS $with_named_thread" -+ LIBS="-pthread $LIBS" - with_posix_threads="yes" - with_mit_threads="no" - echo "$ac_t"""$with_named_thread"" 1>&6 +@@ -3684,8 +3661,6 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lc_r $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi +@@ -3935,14 +3910,6 @@ + else + CFLAGS="$CFLAGS -DDBUG_OFF" + CXXFLAGS="$CXXFLAGS -DDBUG_OFF" +- if test "$ac_cv_prog_gcc" = "yes" +- then +- CFLAGS="-O6 $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ +- else +- CFLAGS="-O $CFLAGS" +- CXXFLAGS="-O $CXXFLAGS" +- fi + fi + + # Force static compilation to avoid linking probles/get more speed -- cgit v1.2.3