Tue Feb 17 14:44:41 2015 UTC ()
Ensure we use libevent from pkgsrc or native instead of the bundled one.


(jperkin)
diff -r1.3 -r1.4 pkgsrc/databases/mysql-cluster/Makefile.common
cvs diff -r1.3 -r1.4 pkgsrc/databases/mysql-cluster/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql-cluster/Attic/Makefile.common 2015/02/09 06:46:55 1.3
+++ pkgsrc/databases/mysql-cluster/Attic/Makefile.common 2015/02/17 14:44:40 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.3 2015/02/09 06:46:55 jnemeth Exp $ 1# $NetBSD: Makefile.common,v 1.4 2015/02/17 14:44:40 jperkin Exp $
2# 2#
3# used by databases/mysql-cluster/Makefile 3# used by databases/mysql-cluster/Makefile
4 4
5DISTNAME= mysql-cluster-gpl-7.3.8 5DISTNAME= mysql-cluster-gpl-7.3.8
6CATEGORIES= databases 6CATEGORIES= databases
7MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-Cluster-7.3/} 7MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-Cluster-7.3/}
8 8
9MAINTAINER?= pkgsrc-users@NetBSD.org 9MAINTAINER?= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.mysql.com/products/cluster/ 10HOMEPAGE= http://www.mysql.com/products/cluster/
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
@@ -49,26 +49,28 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/do @@ -49,26 +49,28 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/do
49CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql" 49CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
50CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql" 50CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
51CMAKE_ARGS+= -DINSTALL_INFODIR="info" 51CMAKE_ARGS+= -DINSTALL_INFODIR="info"
52CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}" 52CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
53CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql" 53CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
54CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test" 54CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test"
55CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin" 55CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
56CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin" 56CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
57CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin" 57CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
58CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench" 58CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
59CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql" 59CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
60CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR} 60CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
61 61
 62CMAKE_ARGS+= -DWITH_LIBEVENT="system"
 63CMAKE_ARGS+= -DWITH_BUNDLED_LIBEVENT=OFF
62CMAKE_ARGS+= -DWITH_ZLIB="system" 64CMAKE_ARGS+= -DWITH_ZLIB="system"
63CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q} 65CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q}
64CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q} 66CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
65CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q} 67CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
66CMAKE_ARGS+= -DWITH_NDB_JAVA=OFF 68CMAKE_ARGS+= -DWITH_NDB_JAVA=OFF
67 69
68# MySQL 5 depends on builtin functions enabled with i486 and later with GCC. 70# MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
69.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) 71.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
70GNU_ARCH.i386= i486 72GNU_ARCH.i386= i486
71CFLAGS+= -march=i486 73CFLAGS+= -march=i486
72.endif 74.endif
73 75
74# Ensure the correct DTrace ABI is used. 76# Ensure the correct DTrace ABI is used.
@@ -117,14 +119,15 @@ SUBST_FILES.vars= scripts/mysql_install_ @@ -117,14 +119,15 @@ SUBST_FILES.vars= scripts/mysql_install_
117SUBST_VARS.vars= PKG_SYSCONFDIR 119SUBST_VARS.vars= PKG_SYSCONFDIR
118 120
119.if ${_OPSYS_SHLIB_TYPE} == "dylib" 121.if ${_OPSYS_SHLIB_TYPE} == "dylib"
120SOEXT="dylib" 122SOEXT="dylib"
121.else 123.else
122SOEXT="so" 124SOEXT="so"
123.endif 125.endif
124 126
125CMAKE_ARGS+= -DWITH_EDITLINE=system 127CMAKE_ARGS+= -DWITH_EDITLINE=system
126CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editline}/lib/libedit.${SOEXT} 128CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editline}/lib/libedit.${SOEXT}
127CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/include/readline 129CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/include/readline
128 130
129.include "../../devel/editline/buildlink3.mk" 131.include "../../devel/editline/buildlink3.mk"
 132.include "../../devel/libevent/buildlink3.mk"
130.include "../../devel/zlib/buildlink3.mk" 133.include "../../devel/zlib/buildlink3.mk"