diff options
| author | ryoon <ryoon> | 2013-08-22 12:28:08 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2013-08-22 12:28:08 +0000 |
| commit | f06395c0411b8c7a5dc773e347a4c4a79173b5f1 (patch) | |
| tree | 3a3cbb8c7562c983c25e299c6fc58af513c80494 /databases/mysql55-client | |
| parent | 70385683bd63a11db96da95920f0ea5e1f75079a (diff) | |
| download | pkgsrc-f06395c0411b8c7a5dc773e347a4c4a79173b5f1.tar.gz | |
Fix editline build.
Convert to use mk/readline.buildlink3.mk.
No objection on pkgsrc-users@.
Diffstat (limited to 'databases/mysql55-client')
| -rw-r--r-- | databases/mysql55-client/Makefile.common | 10 | ||||
| -rw-r--r-- | databases/mysql55-client/distinfo | 3 | ||||
| -rw-r--r-- | databases/mysql55-client/patches/patch-cmake_readline.cmake | 19 |
3 files changed, 29 insertions, 3 deletions
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common index b3e5b24f56a..60098c87e33 100644 --- a/databases/mysql55-client/Makefile.common +++ b/databases/mysql55-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.30 2013/07/31 18:51:41 adam Exp $ +# $NetBSD: Makefile.common,v 1.31 2013/08/22 12:28:08 ryoon Exp $ # # used by databases/mysql55-client/Makefile # used by databases/mysql55-server/Makefile @@ -112,5 +112,11 @@ SUBST_SED.scr= -e "s,chown,${CHOWN},g" SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" SUBST_MESSAGE.scr= Fixing scripts. -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" + +.if !empty(READLINE_TYPE:Mreadline) +CMAKE_ARGS+= -DREADLINE_FOUND=system +.endif +CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline + .include "../../devel/zlib/buildlink3.mk" diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo index 1811d494630..ab0236bc5ae 100644 --- a/databases/mysql55-client/distinfo +++ b/databases/mysql55-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2013/07/31 18:51:41 adam Exp $ +$NetBSD: distinfo,v 1.26 2013/08/22 12:28:08 ryoon Exp $ SHA1 (mysql-5.5.33.tar.gz) = 40c6d63e8a959458737f6fa485d3598c12aef670 RMD160 (mysql-5.5.33.tar.gz) = a2574b2ff320b0b4f93fb3a616f4ebbacd31f641 @@ -10,6 +10,7 @@ SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0 SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206 SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600 SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 +SHA1 (patch-cmake_readline.cmake) = aed279d6740e70d7e0e7565a6d9f0f214c866c8d SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af diff --git a/databases/mysql55-client/patches/patch-cmake_readline.cmake b/databases/mysql55-client/patches/patch-cmake_readline.cmake new file mode 100644 index 00000000000..b57e5660fd4 --- /dev/null +++ b/databases/mysql55-client/patches/patch-cmake_readline.cmake @@ -0,0 +1,19 @@ +$NetBSD: patch-cmake_readline.cmake,v 1.1 2013/08/22 12:28:08 ryoon Exp $ + +* Fix cmake's check build error. Borrowed from mysql56's readline.cmake. + +--- cmake/readline.cmake.orig 2013-06-19 15:26:27.000000000 +0000 ++++ cmake/readline.cmake +@@ -156,8 +156,11 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE name) + #include <readline/readline.h> + int main(int argc, char **argv) + { +- char res= *(*rl_completion_entry_function)(0,0); ++ typedef int MYFunction(const char*, int); ++ MYFunction* myf= rl_completion_entry_function; ++ int res= (myf)(NULL, 0); + completion_matches(0,0); ++ return res; + }" + ${name}_USE_LIBEDIT_INTERFACE) + |