Mon May 11 21:25:02 2020 UTC ()
mysql57-client: be more explicit about where libedit headers are


(tnn)
diff -r1.26 -r1.27 pkgsrc/databases/mysql57-client/Makefile.common
cvs diff -r1.26 -r1.27 pkgsrc/databases/mysql57-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/Makefile.common 2020/05/09 16:59:49 1.26
+++ pkgsrc/databases/mysql57-client/Makefile.common 2020/05/11 21:25:02 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.26 2020/05/09 16:59:49 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.27 2020/05/11 21:25:02 tnn Exp $
2# 2#
3# used by databases/mysql57-client/Makefile 3# used by databases/mysql57-client/Makefile
4# used by databases/mysql57-server/Makefile 4# used by databases/mysql57-server/Makefile
5 5
6DISTNAME= mysql-5.7.30 6DISTNAME= mysql-5.7.30
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.mysql.com/ 11HOMEPAGE= https://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql57-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql57-client/distinfo
@@ -56,27 +56,27 @@ CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMAND @@ -56,27 +56,27 @@ CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMAND
56CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql" 56CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
57CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test" 57CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test"
58CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin" 58CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
59CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin" 59CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
60CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin" 60CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
61CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench" 61CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
62CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql" 62CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
63CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR} 63CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
64 64
65CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 65CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
66 66
67CMAKE_ARGS+= -DWITH_BOOST="system" 67CMAKE_ARGS+= -DWITH_BOOST="system"
68CMAKE_ARGS+= -DWITH_EDITLINE="system" 68CMAKE_ARGS+= -DWITH_EDITLINE="system"
69CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/include 69CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline:Q}/${BUILDLINK_INCDIRS.editline}
70CMAKE_ARGS+= -DWITH_LIBEVENT="system" 70CMAKE_ARGS+= -DWITH_LIBEVENT="system"
71CMAKE_ARGS+= -DWITH_LZ4="system" 71CMAKE_ARGS+= -DWITH_LZ4="system"
72CMAKE_ARGS+= -DWITH_SSL="system" 72CMAKE_ARGS+= -DWITH_SSL="system"
73CMAKE_ARGS+= -DWITH_ZLIB="system" 73CMAKE_ARGS+= -DWITH_ZLIB="system"
74CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET} 74CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET}
75CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION} 75CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION}
76CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET} 76CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
77 77
78# we need atomic builtins 78# we need atomic builtins
79.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 79.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
80GNU_ARCH.i386= i586 80GNU_ARCH.i386= i586
81CFLAGS+= -march=i586 81CFLAGS+= -march=i586
82.endif 82.endif