pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/databases/mysql56-client Fix build when devel/editline...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/44b3dfcfdd16
branches:  trunk
changeset: 621710:44b3dfcfdd16
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Jul 15 02:04:36 2013 +0000

description:
Fix build when devel/editline is installed, but it is not used by this.

diffstat:

 databases/mysql56-client/distinfo                           |   3 +-
 databases/mysql56-client/patches/patch-cmake_readline.cmake |  18 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 3658bb82fbc9 -r 44b3dfcfdd16 databases/mysql56-client/distinfo
--- a/databases/mysql56-client/distinfo Mon Jul 15 02:04:21 2013 +0000
+++ b/databases/mysql56-client/distinfo Mon Jul 15 02:04:36 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/06/04 18:17:25 adam Exp $
+$NetBSD: distinfo,v 1.6 2013/07/15 02:04:36 ryoon Exp $
 
 SHA1 (mysql-5.6.12.tar.gz) = 852e168fd39bb24adf8805642be20a59042c2e6c
 RMD160 (mysql-5.6.12.tar.gz) = 0088072e353f21fe0b079fe7c26500c822c76819
@@ -8,6 +8,7 @@
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
 SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
+SHA1 (patch-cmake_readline.cmake) = f1ec8ccbebb5b7851199bec457d4029c8a9e63dc
 SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
 SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
 SHA1 (patch-include_my__global.h) = d4574aea74221fe3626f3a0c0f5cee9a4d2f36dc
diff -r 3658bb82fbc9 -r 44b3dfcfdd16 databases/mysql56-client/patches/patch-cmake_readline.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql56-client/patches/patch-cmake_readline.cmake       Mon Jul 15 02:04:36 2013 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-cmake_readline.cmake,v 1.1 2013/07/15 02:04:36 ryoon Exp $
+
+* If devel/editline is installed and use base libedit, cmake
+  readline.h detection fails. Disable mis-detection of
+  /usr/pkg/editline/readline.h.
+
+--- cmake/readline.cmake.orig  2013-05-21 15:18:39.000000000 +0000
++++ cmake/readline.cmake
+@@ -130,9 +130,6 @@ MACRO (MYSQL_USE_BUNDLED_EDITLINE)
+ ENDMACRO()
+ 
+ MACRO (FIND_SYSTEM_EDITLINE)
+-  FIND_PATH(FOUND_EDITLINE_READLINE
+-    NAMES editline/readline.h
+-  )
+   IF(FOUND_EDITLINE_READLINE)
+     SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
+   ELSE()



Home | Main Index | Thread Index | Old Index