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/mysql41-server/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'databases/mysql41-server/Makefile') 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: -- cgit v1.2.3