remove pth FLAVOR and just make it the default until our threads library is suitable for use with MySQL.

This commit is contained in:
brad 2001-03-12 00:10:26 +00:00
parent a64fa35d5d
commit 0f08e2d351
2 changed files with 4 additions and 14 deletions

View File

@ -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

View File

@ -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 <brad@openbsd.org>
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