diff options
| author | joerg <joerg@pkgsrc.org> | 2013-06-16 20:39:12 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-06-16 20:39:12 +0000 |
| commit | 127dc819c07236de8b4a81a98988971163c3ae0e (patch) | |
| tree | a9764efb5ec5b15fd33c12c23c502fd6ad07f0c4 /databases/mysql56-client | |
| parent | d4b0767a21d0cf95d85ebe0b1329a6176061c852 (diff) | |
| download | pkgsrc-127dc819c07236de8b4a81a98988971163c3ae0e.tar.gz | |
Really use the system readline/editline.
Diffstat (limited to 'databases/mysql56-client')
| -rw-r--r-- | databases/mysql56-client/Makefile | 11 | ||||
| -rw-r--r-- | databases/mysql56-client/Makefile.common | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile index 21c8c04d585..5544f763ce8 100644 --- a/databases/mysql56-client/Makefile +++ b/databases/mysql56-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/06/04 18:17:25 adam Exp $ +# $NetBSD: Makefile,v 1.5 2013/06/16 20:39:12 joerg Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc @@ -36,4 +36,13 @@ post-install: .endif .include "../../devel/readline/buildlink3.mk" + +CMAKE_ARGS+= -DWITH_EDITLINE=system +.if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) && !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) +CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libedit.so +.else +CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libreadline.so +.endif +CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.readline}/include/readline + .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common index fdb70571604..10f19494370 100644 --- a/databases/mysql56-client/Makefile.common +++ b/databases/mysql56-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2013/06/04 18:17:25 adam Exp $ +# $NetBSD: Makefile.common,v 1.6 2013/06/16 20:39:12 joerg Exp $ # # used by databases/mysql56-client/Makefile # used by databases/mysql56-server/Makefile @@ -15,7 +15,6 @@ DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches USE_CMAKE= yes -USE_GNU_READLINE= yes USE_LANGUAGES= c c++ USE_TOOLS+= bash gmake perl:run @@ -62,14 +61,10 @@ CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql" CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR} # always use our own readline, not MySQL bundled one -CMAKE_ARGS+= -DWITH_LIBEDIT=OFF -CMAKE_ARGS+= -DUSE_NEW_READLINE_INTERFACE=ON -CMAKE_ARGS+= -DREADLINE_LIBRARY=readline CMAKE_ARGS+= -DWITH_ZLIB="system" CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q} CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q} CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q} -BROKEN_READLINE_DETECTION= yes # At least on RHEL 5.6 # MySQL 5 depends on builtin functions enabled with i486 and later with GCC. .if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) |