pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/mysql56-client MySQL 5.6 does not support re...
details: https://anonhg.NetBSD.org/pkgsrc/rev/39259decfcc2
branches: trunk
changeset: 626115:39259decfcc2
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Fri Nov 01 13:35:10 2013 +0000
description:
MySQL 5.6 does not support readline, force editline.
diffstat:
databases/mysql56-client/Makefile.common | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diffs (28 lines):
diff -r a3dbd25558d3 -r 39259decfcc2 databases/mysql56-client/Makefile.common
--- a/databases/mysql56-client/Makefile.common Fri Nov 01 13:27:17 2013 +0000
+++ b/databases/mysql56-client/Makefile.common Fri Nov 01 13:35:10 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2013/10/01 10:26:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2013/11/01 13:35:10 jperkin Exp $
#
# used by databases/mysql56-client/Makefile
# used by databases/mysql56-server/Makefile
@@ -116,14 +116,9 @@
SOEXT="so"
.endif
-.include "../../mk/readline.buildlink3.mk"
+CMAKE_ARGS+= -DWITH_EDITLINE=system
+CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editline}/lib/libedit.${SOEXT}
+CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/include/readline
-CMAKE_ARGS+= -DWITH_EDITLINE=system
-.if !empty(READLINE_TYPE:Meditline)
-CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libedit.${SOEXT}
-.elif !empty(READLINE_TYPE:Mreadline)
-CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libreadline.${SOEXT}
-.endif
-CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline
-
+.include "../../devel/editline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index