diff options
| author | Dirk Froemberg <dirk@FreeBSD.org> | 2002-11-13 10:38:20 +0000 |
|---|---|---|
| committer | Dirk Froemberg <dirk@FreeBSD.org> | 2002-11-13 10:38:20 +0000 |
| commit | d649ce27bb961faea4bbcfa2c4dc7b844f336d51 (patch) | |
| tree | 9a4a20b613dbe7ea6f4925146af5fc76cfd875c0 /databases/mysql55-server | |
| parent | Fix (rare) installation problem when some files already exist in bin/. (diff) | |
-STABLE exits with signal 11 while connecting via TCP/IP if empty
prototypes are used. -CURRENT needs empty prototypes to build. Use
__FreeBSD_version to differentiate.
Set CXX to $CC on -STABLE again to get around stability problems
under heavy load.
Notes
Notes:
svn path=/head/; revision=70020
Diffstat (limited to 'databases/mysql55-server')
| -rw-r--r-- | databases/mysql55-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/mysql55-server/files/patch-sql_mysqld.cc | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 3f507e4537b2..dab4c5e45cbc 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 3.23.53 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ @@ -72,6 +72,9 @@ CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti .if ${OSVERSION} >= 400002 CXXFLAGS+= -fno-exceptions .endif +.if ${OSVERSION} < 500000 +CONFIGURE_ENV+= CXX="${CC}" +.endif # MySQL-Server part .if !defined(CLIENT_ONLY) diff --git a/databases/mysql55-server/files/patch-sql_mysqld.cc b/databases/mysql55-server/files/patch-sql_mysqld.cc index e71985ed937a..5155bd5f33cd 100644 --- a/databases/mysql55-server/files/patch-sql_mysqld.cc +++ b/databases/mysql55-server/files/patch-sql_mysqld.cc @@ -1,11 +1,12 @@ ---- sql/mysqld.cc.orig Wed Aug 14 00:08:13 2002 -+++ sql/mysqld.cc Sun Nov 10 10:23:55 2002 -@@ -92,7 +92,7 @@ +--- sql/mysqld.cc.orig Thu Oct 10 12:17:28 2002 ++++ sql/mysqld.cc Tue Nov 12 23:23:27 2002 +@@ -92,7 +92,8 @@ int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; -#ifdef __STDC__ -+#if defined(__STDC__) && !defined(__FreeBSD__) ++#include <osreldate.h> ++#if defined(__STDC__) && __FreeBSD_version < 500000 #define my_fromhost(A) fromhost(A) #define my_hosts_access(A) hosts_access(A) #define my_eval_client(A) eval_client(A) |