summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant>2006-03-03 04:00:09 +0000
committergrant <grant>2006-03-03 04:00:09 +0000
commitc601bdf73d42a5660c89aa650b2dcacd201ac8c7 (patch)
tree7d6380499bd8114f224e08e7559ffc2c569b37b7
parent6d096e2e0f34dfef18e650c92ef25fea633dfee8 (diff)
downloadpkgsrc-c601bdf73d42a5660c89aa650b2dcacd201ac8c7.tar.gz
disable assembler stuff on Solaris/x86, because it's likely to work
only with GNU as(1). XXX this condition should probably be reversed to the positive case, XXX not the negative case so that it works on more platforms.
-rw-r--r--databases/mysql4-client/Makefile.common5
-rw-r--r--databases/mysql5-client/Makefile.common5
2 files changed, 6 insertions, 4 deletions
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 0ff36db5c95..18173f0634b 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2006/01/23 17:57:47 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.50 2006/03/03 04:00:09 grant Exp $
DISTNAME= mysql-4.1.15
CATEGORIES= databases
@@ -65,7 +65,8 @@ CONFIGURE_ARGS+= --with-vio
CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q}
CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
-.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix"
+.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \
+ ${OPSYS} != "SunOS"
CONFIGURE_ARGS+= --enable-assembler
.endif
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index bf4d301aa07..1f0f29d7f60 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2006/01/23 17:57:47 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.7 2006/03/03 04:00:09 grant Exp $
DISTNAME= mysql-5.0.18
CATEGORIES= databases
@@ -66,7 +66,8 @@ CONFIGURE_ARGS+= --with-vio
CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q}
CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
-.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix"
+.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \
+ ${OPSYS} != "SunOS"
CONFIGURE_ARGS+= --enable-assembler
.endif