summaryrefslogtreecommitdiff
path: root/databases/mysql4-client/Makefile.common
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2004-11-08 18:19:41 +0000
committerxtraeme <xtraeme>2004-11-08 18:19:41 +0000
commitbbe4bc9168bc68e281c5d036973b266db8ed0c7f (patch)
treefbc370bac0b064f4547fb6493b9402997961746b /databases/mysql4-client/Makefile.common
parentfba566efba9f48485c13f598c336002f3706edbc (diff)
downloadpkgsrc-bbe4bc9168bc68e281c5d036973b266db8ed0c7f.tar.gz
Fix breakage added in last commits in mysql4-* packages:
* Make mysql4-client build on NetBSD 1.[56]* * Don't install mysqld and friends in mysql4-client (eww!) * Remove an unneeded patch. * Remove duplicated files in mysql4-client's PLIST. Also, use assembler functions when MACHINE_ARCH == i386. This closes PR pkg/27154, pkg/27720, pkg/27744 and pkg/28035. BTW, I tested them on NetBSD 1.6.2, 2.0_RC4 and -current. Bump PKGREVISION for both packages.
Diffstat (limited to 'databases/mysql4-client/Makefile.common')
-rw-r--r--databases/mysql4-client/Makefile.common16
1 files changed, 14 insertions, 2 deletions
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 69b76725d69..feabc710996 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2004/11/01 08:30:24 grant Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/11/08 18:19:41 xtraeme Exp $
DISTNAME= mysql-4.1.7
CATEGORIES= databases
@@ -53,6 +53,10 @@ CONFIGURE_ARGS+= --with-vio
CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET}
CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET}
+.if !empty(MACHINE_ARCH:Mi386)
+CONFIGURE_ARGS+= --enable-assembler
+.endif
+
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE}
@@ -65,6 +69,15 @@ CFLAGS+= -DHAVE_CURSES_H
CXXFLAGS+= -DHAVE_CURSES_H
.endif
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
+CFLAGS+= -DSIGNALS_DONT_BREAK_READ
+CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
+CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no
+CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
+.endif
+
USE_LANGUAGES= c c++
USE_GNU_TOOLS+= make
USE_PERL5= # defined
@@ -85,4 +98,3 @@ SUBST_MESSAGE.scripts= "Fixing scripts."
.include "../../security/openssl/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"