pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/mysql56-client Use "editline" package from p...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f788298a3781
branches:  trunk
changeset: 652463:f788298a3781
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jun 03 07:13:30 2015 +0000

description:
Use "editline" package from pkgsrc to fix the build under NetBSD.

diffstat:

 databases/mysql56-client/Makefile.common |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r e9475254f1a4 -r f788298a3781 databases/mysql56-client/Makefile.common
--- a/databases/mysql56-client/Makefile.common  Wed Jun 03 06:48:54 2015 +0000
+++ b/databases/mysql56-client/Makefile.common  Wed Jun 03 07:13:30 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2015/06/01 08:15:05 adam Exp $
+# $NetBSD: Makefile.common,v 1.24 2015/06/03 07:13:30 tron Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
@@ -124,5 +124,11 @@
 CMAKE_ARGS+=   -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editline}/lib/libedit.${SOEXT}
 CMAKE_ARGS+=   -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/include/readline
 
+# Don't use the base system "libedit" under NetBSD because MySQL expects
+# an incompatible prototype for "rl_completion_entry_function".
+.if ${OPSYS} == "NetBSD"
+USE_BUILTIN.editline=  no
+.endif
+
 .include "../../devel/editline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"



Home | Main Index | Thread Index | Old Index