From: Marcelo Gutiérrez(UTN/FRH) Date: Tue, 21 Jan 2014 14:08:28 +0000 (+0000) Subject: Rename MySQL client package X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06c8212866389948d7ad80573ea0c3faa7411a9c;p=buildroot.git Rename MySQL client package MySQL client package has been renamed to MySQL. [Peter: fixup help text] Signed-off-by: Marcelo Gutiérrez Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- diff --git a/Config.in.legacy b/Config.in.legacy index 40bc80516a..89181843be 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -125,6 +125,13 @@ config BR2_PACKAGE_LIBNFC_LLCP to 'libllcp'. We have added a new package for 'libllcp' and bumped the version at the same time. +config BR2_PACKAGE_MYSQL_CLIENT + bool "MySQL client renamed to MySQL" + select BR2_LEGACY + select BR2_PACKAGE_MYSQL + help + The option has been renamed BR2_PACKAGE_MYSQL + config BR2_PACKAGE_SQUASHFS3 bool "squashfs3 has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index c45f8bd166..51ba120ce5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -502,7 +502,7 @@ menu "Database" source "package/berkeleydb/Config.in" source "package/cppdb/Config.in" source "package/gdbm/Config.in" -source "package/mysql_client/Config.in" +source "package/mysql/Config.in" source "package/redis/Config.in" source "package/sqlcipher/Config.in" source "package/sqlite/Config.in" diff --git a/package/mysql/Config.in b/package/mysql/Config.in new file mode 100644 index 0000000000..0def95787b --- /dev/null +++ b/package/mysql/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_MYSQL + bool "MySQL" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_READLINE + help + The MySQL Open Source Database System + + http://www.mysql.com/ + +comment "MySQL needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mysql/mysql-ac_cache_check.patch b/package/mysql/mysql-ac_cache_check.patch new file mode 100644 index 0000000000..c3b55ba8d3 --- /dev/null +++ b/package/mysql/mysql-ac_cache_check.patch @@ -0,0 +1,156 @@ +Patch borrowed from +http://code.google.com/p/minimyth/source/browse/trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.47-ac_cache_check.patch?r=6493. + +It allows to override through ac_cv_* variables various checks that +cannot be performed when cross-compiling. + +Signed-off-by: Thomas Petazzoni + +--- + storage/innodb_plugin/plug.in | 59 ++++++++++++++++++++++++++++-------------- + 1 file changed, 40 insertions(+), 19 deletions(-) + +Index: mysql-5.1.53/storage/innodb_plugin/plug.in +=================================================================== +--- mysql-5.1.53.orig/storage/innodb_plugin/plug.in ++++ mysql-5.1.53/storage/innodb_plugin/plug.in +@@ -53,9 +53,10 @@ + esac + AC_SUBST(INNODB_DYNAMIC_CFLAGS) + +- AC_MSG_CHECKING(whether GCC atomic builtins are available) ++ AC_CACHE_CHECK([whether GCC atomic builtins are available], ++ [ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS], + # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not +- AC_TRY_RUN( ++ [AC_TRY_RUN( + [ + int main() + { +@@ -95,18 +96,23 @@ + } + ], + [ +- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], +- [GCC atomic builtins are available]) + AC_MSG_RESULT(yes) ++ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes + ], + [ + AC_MSG_RESULT(no) ++ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=no + ] +- ) ++ )]) ++ if test "x$ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS"= "xyes" ; then ++ AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], ++ [GCC atomic builtins are available]) ++ fi + +- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins) ++ AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins], ++ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC], + # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not +- AC_TRY_RUN( ++ [AC_TRY_RUN( + [ + #include + #include +@@ -126,14 +132,18 @@ + } + ], + [ +- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], +- [pthread_t can be used by GCC atomic builtins]) + AC_MSG_RESULT(yes) ++ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes + ], + [ + AC_MSG_RESULT(no) ++ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=no + ] +- ) ++ )]) ++ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC"= "xyes" ; then ++ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], ++ [pthread_t can be used by GCC atomic builtins]) ++ fi + + AC_MSG_CHECKING(whether Solaris libc atomic functions are available) + # either define HAVE_IB_SOLARIS_ATOMICS or not +@@ -148,9 +158,10 @@ + are available]) + ) + +- AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions) ++ AC_CACHE_CHECK([whether pthread_t can be used by Solaris libc atomic functions], ++ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], + # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not +- AC_TRY_RUN( ++ [AC_TRY_RUN( + [ + #include + #include +@@ -181,28 +192,33 @@ + } + ], + [ +- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], +- [pthread_t can be used by solaris atomics]) + AC_MSG_RESULT(yes) ++ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=yes + ], + [ + AC_MSG_RESULT(no) ++ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no + ] +- ) ++ )]) ++ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS"= "xyes" ; then ++ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], ++ [pthread_t can be used by solaris atomics]) ++ fi + + # this is needed to know which one of atomic_cas_32() or atomic_cas_64() + # to use in the source + AC_CHECK_SIZEOF([pthread_t], [], [#include ]) + + # Check for x86 PAUSE instruction +- AC_MSG_CHECKING(for x86 PAUSE instruction) ++ AC_CACHE_CHECK([for x86 PAUSE instruction], ++ [ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION], + # We have to actually try running the test program, because of a bug + # in Solaris on x86_64, where it wrongly reports that PAUSE is not + # supported when trying to run an application. See + # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684 + # We use ib_ prefix to avoid collisoins if this code is added to + # mysql's configure.in. +- AC_TRY_RUN( ++ [AC_TRY_RUN( + [ + int main() { + __asm__ __volatile__ ("pause"); +@@ -210,16 +226,21 @@ + } + ], + [ +- AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) + AC_MSG_RESULT(yes) ++ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=yes + ], + [ + AC_MSG_RESULT(no) ++ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no + ], + [ + AC_MSG_RESULT(no) ++ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no + ] +- ) ++ )]) ++ if test "x$ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION"= "xyes" ; then ++ AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) ++ fi + ]) + + # vim: set ft=config: diff --git a/package/mysql/mysql-configure-ps-cache-check.patch b/package/mysql/mysql-configure-ps-cache-check.patch new file mode 100644 index 0000000000..336e80e0b7 --- /dev/null +++ b/package/mysql/mysql-configure-ps-cache-check.patch @@ -0,0 +1,39 @@ +Patch borrowed from +http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/mysql/files/configure-ps-cache-check.patch + +It allows to specify through ac_cv_FIND_PROC how ps should be used on +the target to find the PID of a program. + +Signed-off-by: Thomas Petazzoni + +--- + configure.in | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +Index: mysql-5.1.53/configure.in +=================================================================== +--- mysql-5.1.53.orig/configure.in ++++ mysql-5.1.53/configure.in +@@ -462,8 +462,8 @@ + # then Make, then shell. The autoconf substitution uses single quotes, so + # no unprotected single quotes should appear in the expression. + AC_PATH_PROG(PS, ps, ps) +-AC_MSG_CHECKING("how to check if pid exists") +-PS=$ac_cv_path_PS ++AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC], ++[ + # Linux style + if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null + then +@@ -502,8 +502,9 @@ + AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual.]) + esac + fi +-AC_SUBST(FIND_PROC) +-AC_MSG_RESULT("$FIND_PROC") ++ac_cv_FIND_PROC="$FIND_PROC" ++]) ++AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC]) + + # Check if a pid is valid + AC_PATH_PROG(KILL, kill, kill) diff --git a/package/mysql/mysql-use-new-readline-iface.patch b/package/mysql/mysql-use-new-readline-iface.patch new file mode 100644 index 0000000000..c5906563ce --- /dev/null +++ b/package/mysql/mysql-use-new-readline-iface.patch @@ -0,0 +1,21 @@ +Tell MySQL to use the new readline interface even when an external +readline is being used. + +Signed-off-by: Thomas Petazzoni + +--- + configure.in | 1 + + 1 file changed, 1 insertion(+) + +Index: mysql-5.1.53/configure.in +=================================================================== +--- mysql-5.1.53.orig/configure.in ++++ mysql-5.1.53/configure.in +@@ -2689,6 +2689,7 @@ + # this way we avoid linking commercial source with GPL readline + readline_link="-lreadline" + want_to_use_readline="yes" ++ AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1) + elif [test "$mysql_cv_libedit_interface" = "yes"] + then + # Use libedit diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk new file mode 100644 index 0000000000..aaf6ba9773 --- /dev/null +++ b/package/mysql/mysql.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# mysql +# +################################################################################ + +MYSQL_VERSION_MAJOR = 5.1 +MYSQL_VERSION = $(MYSQL_VERSION_MAJOR).70 +MYSQL_SOURCE = mysql-$(MYSQL_VERSION).tar.gz +MYSQL_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_VERSION_MAJOR) +MYSQL_INSTALL_STAGING = YES +MYSQL_DEPENDENCIES = readline ncurses +MYSQL_AUTORECONF = YES +MYSQL_LICENSE = GPLv2 +MYSQL_LICENSE_FILES = README COPYING + +MYSQL_CONF_ENV = \ + ac_cv_sys_restartable_syscalls=yes \ + ac_cv_path_PS=/bin/ps \ + ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \ + ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes \ + ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no \ + ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \ + mysql_cv_new_rl_interface=yes + +MYSQL_CONF_OPT = \ + --without-ndb-binlog \ + --without-server \ + --without-docs \ + --without-man \ + --without-libedit \ + --without-readline \ + --with-low-memory \ + --enable-thread-safe-client \ + $(ENABLE_DEBUG) + +define MYSQL_REMOVE_TEST_PROGS + rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench +endef + +define MYSQL_ADD_MYSQL_LIB_PATH + echo "/usr/lib/mysql" >> $(TARGET_DIR)/etc/ld.so.conf +endef + +MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_REMOVE_TEST_PROGS +MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_ADD_MYSQL_LIB_PATH + +$(eval $(autotools-package)) diff --git a/package/mysql_client/Config.in b/package/mysql_client/Config.in deleted file mode 100644 index 543bed1e6d..0000000000 --- a/package/mysql_client/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_MYSQL_CLIENT - bool "MySQL client" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - help - MySQL client - -comment "MySQL client needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mysql_client/mysql_client-ac_cache_check.patch b/package/mysql_client/mysql_client-ac_cache_check.patch deleted file mode 100644 index c3b55ba8d3..0000000000 --- a/package/mysql_client/mysql_client-ac_cache_check.patch +++ /dev/null @@ -1,156 +0,0 @@ -Patch borrowed from -http://code.google.com/p/minimyth/source/browse/trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.47-ac_cache_check.patch?r=6493. - -It allows to override through ac_cv_* variables various checks that -cannot be performed when cross-compiling. - -Signed-off-by: Thomas Petazzoni - ---- - storage/innodb_plugin/plug.in | 59 ++++++++++++++++++++++++++++-------------- - 1 file changed, 40 insertions(+), 19 deletions(-) - -Index: mysql-5.1.53/storage/innodb_plugin/plug.in -=================================================================== ---- mysql-5.1.53.orig/storage/innodb_plugin/plug.in -+++ mysql-5.1.53/storage/innodb_plugin/plug.in -@@ -53,9 +53,10 @@ - esac - AC_SUBST(INNODB_DYNAMIC_CFLAGS) - -- AC_MSG_CHECKING(whether GCC atomic builtins are available) -+ AC_CACHE_CHECK([whether GCC atomic builtins are available], -+ [ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS], - # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - int main() - { -@@ -95,18 +96,23 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], -- [GCC atomic builtins are available]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], -+ [GCC atomic builtins are available]) -+ fi - -- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins) -+ AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins], -+ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC], - # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - #include - #include -@@ -126,14 +132,18 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], -- [pthread_t can be used by GCC atomic builtins]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], -+ [pthread_t can be used by GCC atomic builtins]) -+ fi - - AC_MSG_CHECKING(whether Solaris libc atomic functions are available) - # either define HAVE_IB_SOLARIS_ATOMICS or not -@@ -148,9 +158,10 @@ - are available]) - ) - -- AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions) -+ AC_CACHE_CHECK([whether pthread_t can be used by Solaris libc atomic functions], -+ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - #include - #include -@@ -181,28 +192,33 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], -- [pthread_t can be used by solaris atomics]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], -+ [pthread_t can be used by solaris atomics]) -+ fi - - # this is needed to know which one of atomic_cas_32() or atomic_cas_64() - # to use in the source - AC_CHECK_SIZEOF([pthread_t], [], [#include ]) - - # Check for x86 PAUSE instruction -- AC_MSG_CHECKING(for x86 PAUSE instruction) -+ AC_CACHE_CHECK([for x86 PAUSE instruction], -+ [ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION], - # We have to actually try running the test program, because of a bug - # in Solaris on x86_64, where it wrongly reports that PAUSE is not - # supported when trying to run an application. See - # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684 - # We use ib_ prefix to avoid collisoins if this code is added to - # mysql's configure.in. -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - int main() { - __asm__ __volatile__ ("pause"); -@@ -210,16 +226,21 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) -+ fi - ]) - - # vim: set ft=config: diff --git a/package/mysql_client/mysql_client-configure-ps-cache-check.patch b/package/mysql_client/mysql_client-configure-ps-cache-check.patch deleted file mode 100644 index 336e80e0b7..0000000000 --- a/package/mysql_client/mysql_client-configure-ps-cache-check.patch +++ /dev/null @@ -1,39 +0,0 @@ -Patch borrowed from -http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/mysql/files/configure-ps-cache-check.patch - -It allows to specify through ac_cv_FIND_PROC how ps should be used on -the target to find the PID of a program. - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -Index: mysql-5.1.53/configure.in -=================================================================== ---- mysql-5.1.53.orig/configure.in -+++ mysql-5.1.53/configure.in -@@ -462,8 +462,8 @@ - # then Make, then shell. The autoconf substitution uses single quotes, so - # no unprotected single quotes should appear in the expression. - AC_PATH_PROG(PS, ps, ps) --AC_MSG_CHECKING("how to check if pid exists") --PS=$ac_cv_path_PS -+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC], -+[ - # Linux style - if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null - then -@@ -502,8 +502,9 @@ - AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual.]) - esac - fi --AC_SUBST(FIND_PROC) --AC_MSG_RESULT("$FIND_PROC") -+ac_cv_FIND_PROC="$FIND_PROC" -+]) -+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC]) - - # Check if a pid is valid - AC_PATH_PROG(KILL, kill, kill) diff --git a/package/mysql_client/mysql_client-use-new-readline-iface.patch b/package/mysql_client/mysql_client-use-new-readline-iface.patch deleted file mode 100644 index c5906563ce..0000000000 --- a/package/mysql_client/mysql_client-use-new-readline-iface.patch +++ /dev/null @@ -1,21 +0,0 @@ -Tell MySQL to use the new readline interface even when an external -readline is being used. - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 1 + - 1 file changed, 1 insertion(+) - -Index: mysql-5.1.53/configure.in -=================================================================== ---- mysql-5.1.53.orig/configure.in -+++ mysql-5.1.53/configure.in -@@ -2689,6 +2689,7 @@ - # this way we avoid linking commercial source with GPL readline - readline_link="-lreadline" - want_to_use_readline="yes" -+ AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1) - elif [test "$mysql_cv_libedit_interface" = "yes"] - then - # Use libedit diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk deleted file mode 100644 index bd4c56509c..0000000000 --- a/package/mysql_client/mysql_client.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# mysql_client -# -################################################################################ - -MYSQL_CLIENT_VERSION_MAJOR = 5.1 -MYSQL_CLIENT_VERSION = $(MYSQL_CLIENT_VERSION_MAJOR).70 -MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz -MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_CLIENT_VERSION_MAJOR) -MYSQL_CLIENT_INSTALL_STAGING = YES -MYSQL_CLIENT_DEPENDENCIES = readline ncurses -MYSQL_CLIENT_AUTORECONF = YES -MYSQL_CLIENT_LICENSE = GPLv2 -MYSQL_CLIENT_LICENSE_FILES = README COPYING - -MYSQL_CLIENT_CONF_ENV = \ - ac_cv_sys_restartable_syscalls=yes \ - ac_cv_path_PS=/bin/ps \ - ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no \ - ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \ - mysql_cv_new_rl_interface=yes - -MYSQL_CLIENT_CONF_OPT = \ - --without-ndb-binlog \ - --without-server \ - --without-docs \ - --without-man \ - --without-libedit \ - --without-readline \ - --with-low-memory \ - --enable-thread-safe-client \ - $(ENABLE_DEBUG) - -define MYSQL_CLIENT_REMOVE_TEST_PROGS - rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench -endef - -define MYSQL_CLIENT_ADD_MYSQL_LIB_PATH - echo "/usr/lib/mysql" >> $(TARGET_DIR)/etc/ld.so.conf -endef - -MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_REMOVE_TEST_PROGS -MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_ADD_MYSQL_LIB_PATH - -$(eval $(autotools-package))