diff options
| author | adam <adam@pkgsrc.org> | 2015-10-07 11:22:00 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2015-10-07 11:22:00 +0000 |
| commit | 3b41f5182d62908416e4a96020f4afe6c6b76fb5 (patch) | |
| tree | 61a8694bcc584dac8c1dd13305b5f97bd5838cd5 /databases/mysql56-client/Makefile.common | |
| parent | 905a42a770f463cb524f7c994fb644d538e34572 (diff) | |
| download | pkgsrc-3b41f5182d62908416e4a96020f4afe6c6b76fb5.tar.gz | |
Fix building with some libedit and libreadline, including those on NetBSD
Diffstat (limited to 'databases/mysql56-client/Makefile.common')
| -rw-r--r-- | databases/mysql56-client/Makefile.common | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common index f6dc57d8a8f..13b4daca693 100644 --- a/databases/mysql56-client/Makefile.common +++ b/databases/mysql56-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2015/10/03 12:46:13 adam Exp $ +# $NetBSD: Makefile.common,v 1.28 2015/10/07 11:22:00 adam Exp $ # # used by databases/mysql56-client/Makefile # used by databases/mysql56-server/Makefile @@ -121,24 +121,15 @@ SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g" SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g" -.include "../../mk/readline.buildlink3.mk" - -.if ${_OPSYS_SHLIB_TYPE} == "dylib" -SOEXT=dylib -.else -SOEXT=so -.endif - -.if !empty(READLINE_TYPE:Mreadline) -CMAKE_ARGS+= -DWITH_EDITLINE=system -.endif -CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libedit.${SOEXT} -CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/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 "../../mk/readline.buildlink3.mk" + +CMAKE_ARGS+= -DWITH_EDITLINE=system +CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline + .include "../../devel/zlib/buildlink3.mk" |