From 3166c1b9e4b71ae632a8cba2776b290f059e1f95 Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Tue, 24 Jul 2007 11:30:28 +0000 Subject: Begin planning for de-orbit burn. This does not build with gcc4.2, and the correct fix is to update to a modern version of MySQL. While here, rip out obsolete 4.X cruft. Hat: portmgr Approved by: maintainer --- databases/mysql323-server/Makefile | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'databases/mysql323-server') diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index 85f15b516dc7..685e37e7eb31 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -56,31 +56,20 @@ CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads -.if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.[35]:${PORTSDIR}/devel/linuxthreads CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else -LIB_DEPENDS+= lthread.[24]:${PORTSDIR}/devel/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' -.endif -.else CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS} CFLAGS+= ${PTHREAD_CFLAGS} .endif -.if ${OSVERSION} < 500000 -CXX= ${CC} +.if ${OSVERSION} >= 700000 +IGNORE= obsolete and does not build with gcc4.2; use mysql 5 or later .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -O3 -fno-omit-frame-pointer -.if ${OSVERSION} > 500000 || (defined(USE_GCC) && (${USE_GCC} == 3.0 || ${USE_GCC} == 3.1 || ${USE_GCC} == 3.2 || ${USE_GCC} == 3.3)) -CFLAGS+= -fno-gcse -.endif -.endif -CXXFLAGS+= ${CFLAGS} -felide-constructors -fno-rtti -.if ${OSVERSION} >= 400002 -CXXFLAGS+= -fno-exceptions +CFLAGS+= -O3 -fno-omit-frame-pointer -fno-gcse .endif +CXXFLAGS+= ${CFLAGS} -felide-constructors -fno-rtti -fno-exceptions # MySQL-Server part .if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY) -- cgit v1.2.3