From 0f08e2d3515b07933442c9fc7b56d75367e48f69 Mon Sep 17 00:00:00 2001 From: brad Date: Mon, 12 Mar 2001 00:10:26 +0000 Subject: [PATCH] remove pth FLAVOR and just make it the default until our threads library is suitable for use with MySQL. --- databases/Makefile | 3 +-- databases/mysql/Makefile | 15 +++------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/databases/Makefile b/databases/Makefile index 2c6cacf5f29..b1f20efe42a 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2000/11/22 17:52:38 dugsong Exp $ +# $OpenBSD: Makefile,v 1.17 2001/03/12 00:10:26 brad Exp $ # $FreeBSD: Makefile,v 1.24 1997/10/04 23:32:05 andreas Exp $ # SUBDIR += db @@ -8,7 +8,6 @@ SUBDIR += iodbc # SUBDIR += msql SUBDIR += mysql - SUBDIR += mysql:pth SUBDIR += openldap SUBDIR += p5-AsciiDB-TagFile SUBDIR += p5-DBD-Pg diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index 238866ee2e4..e18d879c7ad 100644 --- a/databases/mysql/Makefile +++ b/databases/mysql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2001/02/14 00:55:40 brad Exp $ +# $OpenBSD: Makefile,v 1.35 2001/03/12 00:10:26 brad Exp $ # $FreeBSD: Makefile,v 1.44 1999/03/04 21:27:58 dirk Exp $ DISTNAME= mysql-3.23.33 @@ -12,6 +12,8 @@ MASTER_SITE_SUBDIR= MySQL-3.23 HOMEPAGE= http://www.mysql.com/ +LIB_DEPENDS= pthread.13::devel/pth + MAINTAINER= Brad Smith PERMIT_PACKAGE_CDROM= Yes @@ -34,19 +36,8 @@ CONFIGURE_ARGS+= --enable-static \ --without-readline \ --without-bench \ --without-mit-threads - -FLAVORS= pth -FLAVOR?= - -.if ${FLAVOR:L} == "pth" -LIB_DEPENDS= pthread.13::devel/pth CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.else -. if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "powerpc" -BROKEN= "pthreads are currently not working on the ${MACHINE_ARCH} architecture" -. endif -.endif DOCS= manual.html manual.ps manual_toc.html manual.txt