Thu Aug 22 12:28:08 2013 UTC ()
Fix editline build.
Convert to use mk/readline.buildlink3.mk.

No objection on pkgsrc-users@.


(ryoon)
diff -r1.30 -r1.31 pkgsrc/databases/mysql55-client/Makefile.common
diff -r1.25 -r1.26 pkgsrc/databases/mysql55-client/distinfo
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-cmake_readline.cmake
cvs diff -r1.30 -r1.31 pkgsrc/databases/mysql55-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/Makefile.common 2013/07/31 18:51:41 1.30
+++ pkgsrc/databases/mysql55-client/Attic/Makefile.common 2013/08/22 12:28:08 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.30 2013/07/31 18:51:41 adam Exp $ 1# $NetBSD: Makefile.common,v 1.31 2013/08/22 12:28:08 ryoon Exp $
2# 2#
3# used by databases/mysql55-client/Makefile 3# used by databases/mysql55-client/Makefile
4# used by databases/mysql55-server/Makefile 4# used by databases/mysql55-server/Makefile
5 5
6DISTNAME= mysql-5.5.33 6DISTNAME= mysql-5.5.33
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo
@@ -102,15 +102,21 @@ CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ @@ -102,15 +102,21 @@ CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
102.endif 102.endif
103 103
104LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 104LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
105 105
106SUBST_CLASSES+= scr 106SUBST_CLASSES+= scr
107SUBST_STAGE.scr= pre-configure 107SUBST_STAGE.scr= pre-configure
108SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 108SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
109 scripts/mysql_secure_installation.sh \ 109 scripts/mysql_secure_installation.sh \
110 support-files/mysql.server.sh 110 support-files/mysql.server.sh
111SUBST_SED.scr= -e "s,chown,${CHOWN},g" 111SUBST_SED.scr= -e "s,chown,${CHOWN},g"
112SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 112SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
113SUBST_MESSAGE.scr= Fixing scripts. 113SUBST_MESSAGE.scr= Fixing scripts.
114 114
115.include "../../devel/readline/buildlink3.mk" 115.include "../../mk/readline.buildlink3.mk"
 116
 117.if !empty(READLINE_TYPE:Mreadline)
 118CMAKE_ARGS+= -DREADLINE_FOUND=system
 119.endif
 120CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline
 121
116.include "../../devel/zlib/buildlink3.mk" 122.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.25 -r1.26 pkgsrc/databases/mysql55-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/distinfo 2013/07/31 18:51:41 1.25
+++ pkgsrc/databases/mysql55-client/Attic/distinfo 2013/08/22 12:28:08 1.26
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: distinfo,v 1.25 2013/07/31 18:51:41 adam Exp $ 1$NetBSD: distinfo,v 1.26 2013/08/22 12:28:08 ryoon Exp $
2 2
3SHA1 (mysql-5.5.33.tar.gz) = 40c6d63e8a959458737f6fa485d3598c12aef670 3SHA1 (mysql-5.5.33.tar.gz) = 40c6d63e8a959458737f6fa485d3598c12aef670
4RMD160 (mysql-5.5.33.tar.gz) = a2574b2ff320b0b4f93fb3a616f4ebbacd31f641 4RMD160 (mysql-5.5.33.tar.gz) = a2574b2ff320b0b4f93fb3a616f4ebbacd31f641
5Size (mysql-5.5.33.tar.gz) = 24680463 bytes 5Size (mysql-5.5.33.tar.gz) = 24680463 bytes
6SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 6SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
7SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d 7SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d
8SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf 8SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
9SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0 9SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0
10SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206 10SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206
11SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600 11SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600
12SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 12SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09
 13SHA1 (patch-cmake_readline.cmake) = aed279d6740e70d7e0e7565a6d9f0f214c866c8d
13SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 14SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847
14SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 15SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
15SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af 16SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
16SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86 17SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86
17SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88 18SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88
18SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892 19SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892
19SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3 20SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3
20SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59 21SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59
21SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478 22SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478
22SHA1 (patch-sql_CMakeLists.txt) = c4e72a0a93eb94a94501c267e2a43aedf8de2c76 23SHA1 (patch-sql_CMakeLists.txt) = c4e72a0a93eb94a94501c267e2a43aedf8de2c76
23SHA1 (patch-sql_log_event.h) = 43a52ea2f410aa51b99f2f7e1f293a579e13f9c8 24SHA1 (patch-sql_log_event.h) = 43a52ea2f410aa51b99f2f7e1f293a579e13f9c8
24SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c 25SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c
25SHA1 (patch-sql_sql_string.h) = 32c0caf813f7ba94e9ed8fc6d0da4b4a52b41141 26SHA1 (patch-sql_sql_string.h) = 32c0caf813f7ba94e9ed8fc6d0da4b4a52b41141
File Added: pkgsrc/databases/mysql55-client/patches/Attic/patch-cmake_readline.cmake
$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)