mysql server and client 5.1.x and 5.5.x

PATCH New heiko at zuerker.org 2 participants 4 messages May 28, 2011 – Jul 9, 2011

lore

Share & tools

lore

heiko at zuerker.org

author

2011-05-28 17:56 UTC #0 lore raw

PATCH 1/1 mysql server and client 5.1.x and 5.5.x

From: Heiko Zuerker <[email protected]>

Signed-off-by Heiko Zuerker <[email protected]>

---
 package/Config.in                                  |    2 +-
 package/mysql/Config.in                            |   91 ++++++++++++
 .../mysql_client-5.1.53-ac_cache_check.patch       |  156 ++++++++++++++++++++
 ...ql_client-5.1.53-configure-ps-cache-check.patch |   39 +++++
 ...ysql_client-5.1.53-use-new-readline-iface.patch |   21 +++
 .../mysql-5.5.12/mysql-5.5.11-tool-path.patch      |   36 +++++
 package/mysql/mysql.mk                             |  143 ++++++++++++++++++
 package/mysql_client/Config.in                     |   10 --
 .../mysql_client-5.1.53-ac_cache_check.patch       |  156 --------------------
 ...ql_client-5.1.53-configure-ps-cache-check.patch |   39 -----
 ...ysql_client-5.1.53-use-new-readline-iface.patch |   21 ---
 package/mysql_client/mysql_client.mk               |   46 ------
 12 files changed, 487 insertions(+), 273 deletions(-)
 create mode 100644 package/mysql/Config.in
 create mode 100644 package/mysql/mysql-5.1.56/mysql_client-5.1.53-ac_cache_check.patch
 create mode 100644 package/mysql/mysql-5.1.56/mysql_client-5.1.53-configure-ps-cache-check.patch
 create mode 100644 package/mysql/mysql-5.1.56/mysql_client-5.1.53-use-new-readline-iface.patch
 create mode 100644 package/mysql/mysql-5.5.12/mysql-5.5.11-tool-path.patch
 create mode 100644 package/mysql/mysql.mk
 delete mode 100644 package/mysql_client/Config.in
 delete mode 100644 package/mysql_client/mysql_client-5.1.53-ac_cache_check.patch
 delete mode 100644 package/mysql_client/mysql_client-5.1.53-configure-ps-cache-check.patch
 delete mode 100644 package/mysql_client/mysql_client-5.1.53-use-new-readline-iface.patch
 delete mode 100644 package/mysql_client/mysql_client.mk

package/Config.in +1 -1

index 40f523d..72b6ee7 100644
@@ -252,7 +252,6 @@ endmenu
 
 menu "Database"
 source "package/berkeleydb/Config.in"
-source "package/mysql_client/Config.in"
 source "package/sqlite/Config.in"
 endmenu

@@ -364,6 +363,7 @@ endmenu
 endmenu
 
 menu "Miscellaneous"
+source "package/mysql/Config.in"
 source "package/shared-mime-info/Config.in"
 endmenu

package/mysql/Config.in new file +91 -0

91 lines not on this page · raw message

package/mysql/mysql-5.1.56/mysql_client-5.1.53-ac_cache_check.patch new file +156 -0

156 lines not on this page · raw message

package/mysql/mysql-5.1.56/mysql_client-5.1.53-configure-ps-cache-check.patch new file +39 -0

new file mode 100644
index 0000000..336e80e
@@ -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 <[email protected]>
+
+---
+ 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)

package/mysql/mysql-5.1.56/mysql_client-5.1.53-use-new-readline-iface.patch new file +21 -0

new file mode 100644
index 0000000..c590656
@@ -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 <[email protected]>
+
+---
+ 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

package/mysql/mysql-5.5.12/mysql-5.5.11-tool-path.patch new file +36 -0

new file mode 100644
index 0000000..03de86d
@@ -0,0 +1,36 @@
+diff -ruN mysql-5.5.11.orig//extra/CMakeLists.txt mysql-5.5.11/extra/CMakeLists.txt
+--- mysql-5.5.11.orig//extra/CMakeLists.txt	2011-03-31 08:36:18.000000000 -0500
++++ mysql-5.5.11/extra/CMakeLists.txt	2011-05-14 20:17:05.000000000 -0500
+@@ -33,7 +33,7 @@
+ 
+ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
+                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
+-                   COMMAND comp_err
++                   COMMAND ./comp_err
+                     --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
+                     --out-dir=${PROJECT_BINARY_DIR}/sql/share/
+                     --header_file=${PROJECT_BINARY_DIR}/include/mysqld_error.h 
+diff -ruN mysql-5.5.11.orig//scripts/CMakeLists.txt mysql-5.5.11/scripts/CMakeLists.txt
+--- mysql-5.5.11.orig//scripts/CMakeLists.txt	2011-03-31 08:36:18.000000000 -0500
++++ mysql-5.5.11/scripts/CMakeLists.txt	2011-05-14 20:18:12.000000000 -0500
+@@ -47,7 +47,7 @@
+ ADD_CUSTOM_COMMAND(
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+   ${CAT_COMMAND}
+-  COMMAND comp_sql
++  COMMAND ./comp_sql
+   mysql_fix_privilege_tables
+   mysql_fix_privilege_tables.sql
+   mysql_fix_privilege_tables_sql.c
+diff -ruN mysql-5.5.11.orig//sql/CMakeLists.txt mysql-5.5.11/sql/CMakeLists.txt
+--- mysql-5.5.11.orig//sql/CMakeLists.txt	2011-03-31 08:36:18.000000000 -0500
++++ mysql-5.5.11/sql/CMakeLists.txt	2011-05-14 20:18:58.000000000 -0500
+@@ -189,7 +189,7 @@
+ 
+ ADD_CUSTOM_COMMAND(
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
+-  COMMAND gen_lex_hash > lex_hash.h
++  COMMAND ./gen_lex_hash > lex_hash.h
+   DEPENDS gen_lex_hash
+ )
+

package/mysql/mysql.mk new file +143 -0

143 lines not on this page · raw message

package/mysql_client/Config.in deleted +0 ~~-10~~

deleted file mode 100644
index f07fdb4..0000000
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_MYSQL_CLIENT
-	bool "MySQL client"
-	depends on BR2_INSTALL_LIBSTDCPP
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
-	help
-	  MySQL client
-
-comment "Mysql client requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP

package/mysql_client/mysql_client-5.1.53-ac_cache_check.patch deleted +0 ~~-156~~

156 lines not on this page · raw message

package/mysql_client/mysql_client-5.1.53-configure-ps-cache-check.patch deleted +0 ~~-39~~

deleted file mode 100644
index 336e80e..0000000
@@ -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 <[email protected]>
-
----
- 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)

package/mysql_client/mysql_client-5.1.53-use-new-readline-iface.patch deleted +0 ~~-21~~

deleted file mode 100644
index c590656..0000000
@@ -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 <[email protected]>
-
----
- 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

package/mysql_client/mysql_client.mk deleted +0 ~~-46~~

46 lines not on this page · raw message

Signature · 1 line

1.6.4.2

Thomas Petazzoni

2011-06-04 08:52 UTC #1 lore raw

PATCH 1/1 mysql server and client 5.1.x and 5.5.x

Hello Heiko!

Thanks for taking care of the MySQL package. I have a few comments below, but first, is there a good reason to support both MySQL 5.1 and MySQL 5.5 ? Wouldn't supporting MySQL 5.5 be enough ?

Quoted 27 lines · On Sat, 28 May 2011 12:56:20 -0500 heiko at zuerker.org wrote:

package/mysql/Config.in new file +21 -0

new file mode 100644
index 0000000..3c44ec3
@@ -0,0 +1,91 @@
+config BR2_PACKAGE_MYSQL
+	bool "MySQL"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
+	help
+	  MySQL client and optional server
+
+menu "MySQL options"
+depends on BR2_PACKAGE_MYSQL
+
+choice
+	prompt "MySQL Version"
+	default BR2_PACKAGE_MYSQL_51
+	help
+	  The version of MySQL
+
+config BR2_PACKAGE_MYSQL_51
+	bool "5.1.x"
+	select BR2_TARGET_SYSLINUX
+

package/mysql/Config.in line 31

Quoted 10 lines

package/mysql/Config.in new file +10 -0

+config BR2_PACKAGE_MYSQL_55
+	bool "5.5.x"
+
+endchoice
+
+config BR2_PACKAGE_MYSQL_SERVER
+	bool "Build the MySQL Server"
+	depends on BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE

Since this depends on BR2_PACKAGE_MYSQL, which already selects ncurses and readline, do we really need those selects again ?

package/mysql/mysql-5.5.12/mysql-5.5.11-tool-path.patch

Quoted 5 lines

package/mysql/mysql-5.5.12/mysql-5.5.11-tool-path.patch new file +0 -0
new file mode 100644
index 0000000..03de86d

This patch needs a description + Signed-off-by line.

Quoted 14 lines

package/mysql/mysql.mk new file +11 -0

@@ -0,0 +1,143 @@
+#############################################################
+#
+# MySQL Server & Client
+#
+#############################################################
+
+ifeq ($(BR2_PACKAGE_MYSQL_51),y)
+	MYSQL_MAIN_VERSION = 5.1
+	MYSQL_VERSION = $(MYSQL_MAIN_VERSION).57
+endif
+

package/mysql/mysql.mk line 21

Quoted 10 lines

package/mysql/mysql.mk new file +10 -0

+ifeq ($(BR2_PACKAGE_MYSQL_55),y)
+	MYSQL_MAIN_VERSION = 5.5
+	MYSQL_VERSION = $(MYSQL_MAIN_VERSION).12
+endif
+
+MYSQL_SOURCE = mysql-$(MYSQL_VERSION).tar.gz
+MYSQL_SITE = http://mirror.services.wisc.edu/mysql/Downloads/MySQL-$(MYSQL_MAIN_VERSION)
+MYSQL_INSTALL_TARGET = YES
+MYSQL_INSTALL_STAGING = YES
+MYSQL_DEPENDENCIES = readline ncurses host-mysql

Could you detail why host-mysql is needed as a dependency ? (For example by adding a comment).

package/mysql/mysql.mk line 74

Quoted 1 line

package/mysql/mysql.mk new file +1 -0
+		-DMYSQL_DATADIR=/var/mysql

What about using the configuration option for the data directory ?

Quoted 31 lines

package/mysql/mysql.mk new file +31 -0

+# Generic section
+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
+
+ifeq ($(BR2_PACKAGE_MYSQL_REMOVE_TEST_PROGS),y)
+	MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_REMOVE_TEST_PROGS 
+endif
+
+MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_ADD_MYSQL_LIB_PATH
+
+MYSQL_POST_CONFIGURE_HOOKS += MYSQL_COPY_HOST_BINARIES
+
+define MYSQL_COPY_HOST_BINARIES
+	cp $(@D)/../host-mysql-$(MYSQL_VERSION)/sql/gen_lex_hash $(@D)/sql/
+	cp $(@D)/../host-mysql-$(MYSQL_VERSION)/scripts/comp_sql $(@D)/scripts/
+	cp $(@D)/../host-mysql-$(MYSQL_VERSION)/extra/comp_err $(@D)/extra/
+	# set the file dates far into the future to prevent recompilation
+	touch -t "203012120101" $(@D)/sql/gen_lex_hash
+	touch -t "203012120101" $(@D)/scripts/comp_sql
+	touch -t "203012120101" $(@D)/extra/comp_err
+endef
+
+define HOST_MYSQL_BUILD_CMDS
+	make -C $(@D)/vio
+	make -C $(@D)/mysys
+	make -C $(@D)/strings

package/mysql/mysql.mk line 142

Quoted 10 lines

package/mysql/mysql.mk new file +10 -0

+	make -C $(@D)/dbug
+	make -C $(@D)/regex
+	make -C $(@D)/sql gen_lex_hash
+	make -C $(@D)/scripts comp_sql
+	make -C $(@D)/extra comp_err
+endef
+
+define HOST_MYSQL_INSTALL_CMDS
+	# no need to really install this
+	exit 0

Really ?

package/mysql/mysql.mk line 64

Quoted 1 line

package/mysql/mysql.mk new file +1 -0
+endef

Normally, all those definitions should be before the AUTOTARGETS/CMAKETARGETS calls.

Regards,

Thomas

Signature · 4 lines

Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Heiko Zuerker

author

2011-06-04 13:48 UTC #2 lore raw

PATCH 1/1 mysql server and client 5.1.x and 5.5.x

Hey,

Quoted 11 lines

-----Original Message-----
From: buildroot-bounces at busybox.net [mailto:buildroot- bounces at busybox.net] On Behalf Of Thomas Petazzoni
Sent: Saturday, June 04, 2011 3:52 AM
To: buildroot at busybox.net
Subject: Re: [Buildroot] [PATCH] mysql server and client 5.1.x and 5.5.x
Hello Heiko!
Thanks for taking care of the MySQL package. I have a few comments below, but first, is there a good reason to support both MySQL 5.1 and MySQL 5.5

Quoted 1 line

Wouldn't supporting MySQL 5.5 be enough ?

I'm worried about compatibility of other software with the new MySQL 5.5. I had a lot of problems with that in the past.
I still have to add a lot more software and was planning to remove the 5.1 support once we know that all other packages play nice with the 5.5 version. If you guys really don't like this then we can remove it.

Quoted 34 lines

Quoted 31 lines · On Sat, 28 May 2011 12:56:20 -0500 heiko at zuerker.org wrote:

package/mysql/Config.in new renamed from package/mysql/Config.in +0 -0

file mode 100644 index 0000000..3c44ec3

package/mysql/Config.in new file +26 -0

@@ -0,0 +1,91 @@
+config BR2_PACKAGE_MYSQL
+	bool "MySQL"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
+	help
+	  MySQL client and optional server
+
+menu "MySQL options"
+depends on BR2_PACKAGE_MYSQL
+
+choice
+	prompt "MySQL Version"
+	default BR2_PACKAGE_MYSQL_51
+	help
+	  The version of MySQL
+
+config BR2_PACKAGE_MYSQL_51
+	bool "5.1.x"
+	select BR2_TARGET_SYSLINUX
+
+config BR2_PACKAGE_MYSQL_55
+	bool "5.5.x"
+
+endchoice
+

Quoted 8 lines

package/mysql/Config.in line 31
Quoted 5 lines
package/mysql/Config.in new file +5 -0
+config BR2_PACKAGE_MYSQL_SERVER
+	bool "Build the MySQL Server"
+	depends on BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
Since this depends on BR2_PACKAGE_MYSQL, which already selects ncurses and readline, do we really need those selects again ?

Good point, I'll remove it in the next revision.

Quoted 8 lines

package/mysql/mysql-5.5.12/mysql-5.5.11-tool-path.patch
Quoted 6 lines
package/mysql/mysql-5.5.12/mysql-5.5.11-tool-path.patch new file +0 -0
new file mode 100644
index 0000000..03de86d
This patch needs a description + Signed-off-by line.

Will do.

Quoted 24 lines

package/mysql/mysql.mk
Quoted 4 lines
package/mysql/mysql.mk new file +0 -0
@@ -0,0 +1,143 @@
+#########################################################
####
package/mysql/mysql.mk line 4
Quoted 4 lines
package/mysql/mysql.mk new file +3 -0
+#
+# MySQL Server & Client
+#
+#########################################################
####
package/mysql/mysql.mk
Quoted 11 lines
package/mysql/mysql.mk new file +11 -0
+
+ifeq ($(BR2_PACKAGE_MYSQL_51),y)
+	MYSQL_MAIN_VERSION = 5.1
+	MYSQL_VERSION = $(MYSQL_MAIN_VERSION).57 endif
+
+ifeq ($(BR2_PACKAGE_MYSQL_55),y)
+	MYSQL_MAIN_VERSION = 5.5
+	MYSQL_VERSION = $(MYSQL_MAIN_VERSION).12 endif
+
+MYSQL_SOURCE = mysql-$(MYSQL_VERSION).tar.gz MYSQL_SITE =
+http://mirror.services.wisc.edu/mysql/Downloads/MySQL-
$(MYSQL_MAIN_VE

Quoted 7 lines

package/mysql/mysql.mk line 21
Quoted 4 lines
package/mysql/mysql.mk new file +4 -0
+RSION)
+MYSQL_INSTALL_TARGET = YES
+MYSQL_INSTALL_STAGING = YES
+MYSQL_DEPENDENCIES = readline ncurses host-mysql
Could you detail why host-mysql is needed as a dependency ? (For example by adding a comment).

I'll put it in. MySQL cross-compiling is such a clutch.....

Quoted 3 lines

package/mysql/mysql.mk line 74
Quoted 1 line
package/mysql/mysql.mk new file +1 -0
+		-DMYSQL_DATADIR=/var/mysql
What about using the configuration option for the data directory ?

Ah crap. Will fix it.

Quoted 37 lines

package/mysql/mysql.mk
Quoted 10 lines
package/mysql/mysql.mk new file +10 -0
+# Generic section
+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
+
+ifeq ($(BR2_PACKAGE_MYSQL_REMOVE_TEST_PROGS),y)
+	MYSQL_POST_INSTALL_TARGET_HOOKS +=
MYSQL_REMOVE_TEST_PROGS endif
package/mysql/mysql.mk line 31
Quoted 2 lines
package/mysql/mysql.mk new file +2 -0
+
+MYSQL_POST_INSTALL_TARGET_HOOKS +=
MYSQL_ADD_MYSQL_LIB_PATH
package/mysql/mysql.mk
Quoted 5 lines
package/mysql/mysql.mk new file +5 -0
+
+MYSQL_POST_CONFIGURE_HOOKS += MYSQL_COPY_HOST_BINARIES
+
+define MYSQL_COPY_HOST_BINARIES
+	cp $(@D)/../host-mysql-$(MYSQL_VERSION)/sql/gen_lex_hash
$(@D)/sql/
package/mysql/mysql.mk line 37
Quoted 1 line
package/mysql/mysql.mk new file +1 -0
+	cp $(@D)/../host-mysql-$(MYSQL_VERSION)/scripts/comp_sql
$(@D)/scripts/
package/mysql/mysql.mk line 38
Quoted 1 line
package/mysql/mysql.mk new file +1 -0
+	cp $(@D)/../host-mysql-$(MYSQL_VERSION)/extra/comp_err
$(@D)/extra/
Quoted 13 lines
package/mysql/mysql.mk new file +13 -0
+	# set the file dates far into the future to prevent recompilation
+	touch -t "203012120101" $(@D)/sql/gen_lex_hash
+	touch -t "203012120101" $(@D)/scripts/comp_sql
+	touch -t "203012120101" $(@D)/extra/comp_err endef
+
+define HOST_MYSQL_BUILD_CMDS
+	make -C $(@D)/vio
+	make -C $(@D)/mysys
+	make -C $(@D)/strings
+	make -C $(@D)/dbug
+	make -C $(@D)/regex
+	make -C $(@D)/sql gen_lex_hash
+	make -C $(@D)/scripts comp_sql

Quoted 8 lines

package/mysql/mysql.mk line 142
Quoted 6 lines
package/mysql/mysql.mk new file +6 -0
+	make -C $(@D)/extra comp_err
+endef
+
+define HOST_MYSQL_INSTALL_CMDS
+	# no need to really install this
+	exit 0
Really ?

Yup. ;-)
All we need is a couple of binaries from the host-mysql.
I have a "bug" open with the guys at mysql on cross-compiling, but don't think it'll go anywhere. :(

Quoted 4 lines

package/mysql/mysql.mk line 58
Quoted 1 line
package/mysql/mysql.mk new file +1 -0
+endef
Normally, all those definitions should be before the AUTOTARGETS/CMAKETARGETS calls.

No problem, I'll fix that. (Not sure when I'll get a chance to work on it.)

Signature · 3 lines

Regards
   Heiko Zuerker
   http://www.devil-linux.org

Heiko Zuerker

author Applied

2011-07-09 13:19 UTC #3 lore raw

PATCH 1/1 mysql server and client 5.1.x and 5.5.x

All,

I applied all the requested changes to the new mysql package.

Signature · 3 lines

Regards
   Heiko Zuerker
   http://www.devil-linux.org