Update MySQL client package

PATCH New Marcelo Gutiérrez(UTN/FRH) 3 participants 4 messages Jan 17, 2014 – Jan 18, 2014

lore

Share & tools

lore

Marcelo Gutiérrez(UTN/FRH)

author

2014-01-17 20:25 UTC #0 lore raw

PATCH 1/1 Update MySQL client package

From: Marcelo Gutierrez <[email protected]>

Added MySQL server support. The patches are based on buildroot-2013.11

Signed-off-by Marcelo Gutierrez (UTN/FRH) <[email protected]>

---
 package/mysql_client/Config.in                     |   12 ++++-
 package/mysql_client/S60mysqld                     |   25 +++++++++
 package/mysql_client/misc.m4.patch                 |   11 ++++
 package/mysql_client/mysql_client.mk               |   53 ++++++++++++++++++--
 .../mysql_server/mysql_client-crosscompiling.patch |   23 +++++++++
 5 files changed, 119 insertions(+), 5 deletions(-)
 create mode 100644 package/mysql_client/S60mysqld
 create mode 100644 package/mysql_client/misc.m4.patch
 create mode 100644 package/mysql_client/mysql_server/mysql_client-crosscompiling.patch

package/mysql_client/Config.in +10 -2

index 543bed1..1ee6067 100644
@@ -6,8 +6,16 @@ config BR2_PACKAGE_MYSQL_CLIENT
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
 	help
-	  MySQL client
+	  The MySQL Open Source Database System
 
-comment "MySQL client needs a toolchain w/ C++, threads"
+comment "MySQL server and MySQL client needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+if BR2_PACKAGE_MYSQL_CLIENT
+	
+config BR2_PACKAGE_MYSQL_CLIENT_SERVER
+	bool "MySQL server"
+
+endif
+

package/mysql_client/S60mysqld new file +25 -0

new file mode 100644
index 0000000..38e1c41
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Starts mysqld.
+#
+
+case "$1" in
+	start)
+		/usr/bin/mysqld_safe &
+		;;
+	stop)
+		if test -f /var/lib/mysql/mysqld.pid ; then
+			PID=`cat /var/lib/mysql/mysqld.pid`
+			kill $PID
+		fi
+		;;
+	restart)
+		$0 stop
+		$0 start
+		;;
+	*)
+		echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
+		;;
+esac
+
+exit 0

package/mysql_client/misc.m4.patch new file +11 -0

new file mode 100644
index 0000000..afa23f2
@@ -0,0 +1,11 @@
+--- mysql-5.1.70.orig/config/ac-macros/misc.m4
++++ mysql-5.1.70/config/ac-macros/misc.m4
+@@ -477,7 +477,7 @@
+     exit(ptr_f(&a) < 0);
+   }
+   ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+-   ac_cv_c_stack_direction=)])
++   ac_cv_c_stack_direction=0)])
+  AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
+ ])dnl
+

package/mysql_client/mysql_client.mk +50 -3

83 lines not on this page · raw message

package/mysql_client/mysql_server/mysql_client-crosscompiling.patch new file +23 -0

new file mode 100644
index 0000000..ab9454b
@@ -0,0 +1,23 @@
+--- mysql-5.1.70/sql/Makefile.am
++++ mysql-5.1.70.patch/sql/Makefile.am
+@@ -177,7 +177,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		./mysql-gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+ 
+ # For testing of udf_example.so
+
+--- mysql-5.1.70/sql/Makefile.in
++++ mysql-5.1.70.patch/sql/Makefile.in
+@@ -1310,7 +1310,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		./mysql-gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+ 
+ # We might have some stuff not built in this build, but that we want to install

Signature · 1 line

1.7.10.4

Yann E. MORIN

2014-01-18 00:02 UTC #1 lore raw

PATCH 1/1 Update MySQL client package

Marcello, All,

On 2014-01-17 20:25 +0000, Marcelo Guti?rrez(UTN/FRH) spake thusly:

Quoted 3 lines

From: Marcelo Gutierrez <[email protected]>
Added MySQL server support. The patches are based on buildroot-2013.11

Glad to see you eventually managed to build mySQL server. :-)

However, I ahve a few comments, see below:

Quoted 17 lines

Signed-off-by Marcelo Gutierrez (UTN/FRH) <[email protected]>

---
 package/mysql_client/Config.in                     |   12 ++++-
 package/mysql_client/S60mysqld                     |   25 +++++++++
 package/mysql_client/misc.m4.patch                 |   11 ++++
 package/mysql_client/mysql_client.mk               |   53 ++++++++++++++++++--
 .../mysql_server/mysql_client-crosscompiling.patch |   23 +++++++++
 5 files changed, 119 insertions(+), 5 deletions(-)
 create mode 100644 package/mysql_client/S60mysqld
 create mode 100644 package/mysql_client/misc.m4.patch
 create mode 100644 package/mysql_client/mysql_server/mysql_client-crosscompiling.patch

package/mysql_client/Config.in +0 -0

index 543bed1..1ee6067 100644

package/mysql_client/Config.in config BR2_PACKAGE_MYSQL_CLIENT · line 9

Quoted 5 lines

package/mysql_client/Config.in +1 -1

@@ -6,8 +6,16 @@ config BR2_PACKAGE_MYSQL_CLIENT
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
 	help
-	  MySQL client
+	  The MySQL Open Source Database System

Since by default only the client is installed, I'd still say so in the help entry. also, please add the URL to the home of MySQL. Something along the lines of:

The MySQL Open Source Database System.

This option only installs the client. If you want the server, see the option below.

http://website/of/mysql

package/mysql_client/S60mysqld

Quoted 13 lines

package/mysql_client/Config.in +9 -1

-comment "MySQL client needs a toolchain w/ C++, threads"
+comment "MySQL server and MySQL client needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+if BR2_PACKAGE_MYSQL_CLIENT
+	
+config BR2_PACKAGE_MYSQL_CLIENT_SERVER
+	bool "MySQL server"
+
+endif
+

package/mysql_client/S60mysqld +0 -0

[--SNIP--unreviewed--]

package/mysql_client/misc.m4.patch

Quoted 1 line

package/mysql_client/misc.m4.patch +0 -0

This should be named:
mysql_client-0000-short-description.patch

See:
http://buildroot.net/downloads/manual/manual.html#patch-policy

Quoted 2 lines

new file mode 100644
index 0000000..afa23f2

You also should add a commiyt-log-like description as header to that patch, and add your SoB-line as well (see the URL above).

Quoted 20 lines

package/mysql_client/misc.m4.patch new file +11 -0

@@ -0,0 +1,11 @@
+--- mysql-5.1.70.orig/config/ac-macros/misc.m4
++++ mysql-5.1.70/config/ac-macros/misc.m4
+@@ -477,7 +477,7 @@
+     exit(ptr_f(&a) < 0);
+   }
+   ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+-   ac_cv_c_stack_direction=)])
++   ac_cv_c_stack_direction=0)])
+  AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
+ ])dnl
+

package/mysql_client/mysql_client.mk +0 -0

index fe24ae7..c100eba 100644

package/mysql_client/mysql_client.mk line 10

Quoted 9 lines

package/mysql_client/mysql_client.mk +3 -2

@@ -4,15 +4,26 @@
 #
 ################################################################################
 
-MYSQL_CLIENT_VERSION = 5.1.70
+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-5.1
+MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_CLIENT_VERSION_MAJOR)

You are doing in this patch a change that is unrelated to adding the server part. Please provide a spearate patch.

Quoted 45 lines

package/mysql_client/mysql_client.mk +25 -1

 MYSQL_CLIENT_INSTALL_STAGING = YES
 MYSQL_CLIENT_DEPENDENCIES = readline ncurses
 MYSQL_CLIENT_AUTORECONF = YES
 MYSQL_CLIENT_LICENSE = GPLv2
 MYSQL_CLIENT_LICENSE_FILES = README COPYING
 
+
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SERVER),y)
+MYSQL_CLIENT_DEPENDENCIES += host-mysql_client
+HOST_MYSQL_CLIENT_DEPENDENCIES =
+HOST_MYSQL_CLIENT_AUTORECONF = YES
+	
+HOST_MYSQL_CLIENT_CONF_OPT = \
+	--with-embedded-server
+endif
+
 MYSQL_CLIENT_CONF_ENV = \
 	ac_cv_sys_restartable_syscalls=yes \
 	ac_cv_path_PS=/bin/ps \

@@ -24,15 +35,50 @@ MYSQL_CLIENT_CONF_ENV = \
 
 MYSQL_CLIENT_CONF_OPT = \
 	--without-ndb-binlog \
-	--without-server \
 	--without-docs \
 	--without-man \
 	--without-libedit \
 	--without-readline \
+	--without-libedit \
+	--disable-dependency-tracking \
 	--with-low-memory \
+	--with-atomic-ops=up \
 	--enable-thread-safe-client \
+	--without-query-cache \
+	--without-plugin-partition \
+	--without-plugin-daemon_example \
+	--without-plugin-ftexample \
+	--without-plugin-archive \
+	--without-plugin-blackhole \
+	--without-plugin-example \
+	--without-plugin-federated \
+	--without-plugin-ibmdb2i \
+	--without-plugin-innobase \
+	--without-plugin-innodb_plugin \
+	--without-plugin-ndbcluster \

package/mysql_client/mysql_client.mk MYSQL_CLIENT_CONF_ENV = \ · line 68

Quoted 10 lines

package/mysql_client/mysql_client.mk +8 -0

 	$(ENABLE_DEBUG)
 
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SERVER),y)
+	MYSQL_CLIENT_CONF_OPT += --with-embedded-server
+
+define MYSQL_CLIENT_FIX_SERVER
+	support/scripts/apply-patches.sh $(@D) package/mysql_client/mysql_server mysql_client-crosscompiling.patch
+endef
+
+MYSQL_CLIENT_POST_PATCH_HOOKS += MYSQL_CLIENT_FIX_SERVER

Uh-oh... Why do you want this patch to be conditional? Just move the patch along the other one, and have it applied everytime. It hsould not have an impact on the client (and if it does, just fix it so that's not the case).

Which means you'd also require;
MYSQL_CLIENT_AUTORECONF = YES

and you can drop HOST_MYSQL_CLIENT_AUTORECONF = YES since it defaults to the target's value.

package/mysql_client/mysql_client.mk MYSQL_CLIENT_CONF_ENV = \ · line 72

Quoted 3 lines

package/mysql_client/mysql_client.mk +3 -0
+define HOST_MYSQL_CLIENT_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef

Unneeded, that's the default. However, instead of building the whole of MySQL, can't we find a smaller build command for the host variant, that only builds the required program?

package/mysql_client/mysql_client.mk MYSQL_CLIENT_CONF_ENV = \ · line 76

Quoted 3 lines

package/mysql_client/mysql_client.mk +3 -0

+define HOST_MYSQL_CLIENT_INSTALL_CMDS
+	cp $(@D)/sql/gen_lex_hash $(@D)/../mysql_client-$(MYSQL_CLIENT_VERSION)/sql/mysql-gen_lex_hash
+endef

I'm not sure we want to host-install something like that.

Since it looks like a generated (compiled) file, you should just install it to $(HOST)/usr/bin:

    define HOST_MYSQL_CLIENT_INSTALL_CMDS
        $(INSTALL) -m 0755 -d $(@D)/sql/gen_lex_hash \
                   $(HOST)/usr/bin/gen_lex_hash
    endef

and the patch should be changed to:

- ./gen_lex_hash$(EXEEXT) > $@-t
+ gen_lex_hash$(EXEEXT) > $@-t

package/mysql_client/mysql_server/mysql_client-crosscompiling.patch

Quoted 17 lines

package/mysql_client/mysql_client.mk +5 -0

+else
+MYSQL_CLIENT_CONF_OPT += --without-server
+endif
+
 define MYSQL_CLIENT_REMOVE_TEST_PROGS
 	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
 endef

@@ -45,3 +91,4 @@ 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))
+$(eval $(host-autotools-package))

package/mysql_client/mysql_server/mysql_client-crosscompiling.patch new file +0 -0

new file mode 100644
index 0000000..ab9454b

This patch is also missing a commit-log-like description.

Quoted 14 lines

package/mysql_client/mysql_server/mysql_client-crosscompiling.patch new file +13 -0

@@ -0,0 +1,23 @@
+--- mysql-5.1.70/sql/Makefile.am
++++ mysql-5.1.70.patch/sql/Makefile.am
+@@ -177,7 +177,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		./mysql-gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+ 
+ # For testing of udf_example.so
+
+--- mysql-5.1.70/sql/Makefile.in

package/mysql_client/mysql_server/mysql_client-crosscompiling.patch line 23

Quoted 10 lines

package/mysql_client/mysql_server/mysql_client-crosscompiling.patch new file +10 -0

++++ mysql-5.1.70.patch/sql/Makefile.in
+@@ -1310,7 +1310,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		./mysql-gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+ 
+ # We might have some stuff not built in this build, but that we want to install

So, to summup:
- provide a first patch that makes use of _VERSION_MAJOR
- add commit-log descrioption to the patches
- apply all patches unconditionnaly
- so autoreconf both host and target versions
- if possible, only build the host-program, not the whole MySQL
- install host tools to $(HOST)/usr/bin
- add a blurb in the help entry

Thank you for the patch!

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Jerzy Grzegorek

2014-01-18 09:21 UTC #2 lore raw

PATCH 1/1 Update MySQL client package

In reply to Marcelo Gutiérrez(UTN/FRH)

Hi Marcelo,

Quoted 15 lines

From: Marcelo Gutierrez <[email protected]>
Added MySQL server support. The patches are based on buildroot-2013.11
Signed-off-by Marcelo Gutierrez (UTN/FRH) <[email protected]>
---
  package/mysql_client/Config.in                     |   12 ++++-
  package/mysql_client/S60mysqld                     |   25 +++++++++
  package/mysql_client/misc.m4.patch                 |   11 ++++
  package/mysql_client/mysql_client.mk               |   53 ++++++++++++++++++--
  .../mysql_server/mysql_client-crosscompiling.patch |   23 +++++++++
  5 files changed, 119 insertions(+), 5 deletions(-)
create mode 100644 package/mysql_client/S60mysqld
create mode 100644 package/mysql_client/misc.m4.patch
create mode 100644 package/mysql_client/mysql_server/mysql_client-crosscompiling.patc

[...]

Quoted 5 lines

package/mysql_client/mysql_client.mk +0 -0
index fe24ae7..c100eba 100644

package/mysql_client/mysql_client.mk line 10

Quoted 9 lines

package/mysql_client/mysql_client.mk +3 -2

@@ -4,15 +4,26 @@
  #
  ################################################################################
 
-MYSQL_CLIENT_VERSION = 5.1.70
+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-5.1
+MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_CLIENT_VERSION_MAJOR)

It's in master branch since my commit aa593ddbc19a03b (package: add <pkg>_VERSION_MAJOR variable).

Regards,
Jerzy

Quoted 105 lines

package/mysql_client/mysql_client.mk +47 -1

  MYSQL_CLIENT_INSTALL_STAGING = YES
  MYSQL_CLIENT_DEPENDENCIES = readline ncurses
  MYSQL_CLIENT_AUTORECONF = YES
  MYSQL_CLIENT_LICENSE = GPLv2
  MYSQL_CLIENT_LICENSE_FILES = README COPYING
 
+
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SERVER),y)
+MYSQL_CLIENT_DEPENDENCIES += host-mysql_client
+HOST_MYSQL_CLIENT_DEPENDENCIES =
+HOST_MYSQL_CLIENT_AUTORECONF = YES
+	
+HOST_MYSQL_CLIENT_CONF_OPT = \
+	--with-embedded-server
+endif
+
  MYSQL_CLIENT_CONF_ENV = \
  	ac_cv_sys_restartable_syscalls=yes \
  	ac_cv_path_PS=/bin/ps \

@@ -24,15 +35,50 @@ MYSQL_CLIENT_CONF_ENV = \
 
  MYSQL_CLIENT_CONF_OPT = \
  	--without-ndb-binlog \
-	--without-server \
  	--without-docs \
  	--without-man \
  	--without-libedit \
  	--without-readline \
+	--without-libedit \
+	--disable-dependency-tracking \
  	--with-low-memory \
+	--with-atomic-ops=up \
  	--enable-thread-safe-client \
+	--without-query-cache \
+	--without-plugin-partition \
+	--without-plugin-daemon_example \
+	--without-plugin-ftexample \
+	--without-plugin-archive \
+	--without-plugin-blackhole \
+	--without-plugin-example \
+	--without-plugin-federated \
+	--without-plugin-ibmdb2i \
+	--without-plugin-innobase \
+	--without-plugin-innodb_plugin \
+	--without-plugin-ndbcluster \
  	$(ENABLE_DEBUG)
 
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SERVER),y)
+	MYSQL_CLIENT_CONF_OPT += --with-embedded-server
+
+define MYSQL_CLIENT_FIX_SERVER
+	support/scripts/apply-patches.sh $(@D) package/mysql_client/mysql_server mysql_client-crosscompiling.patch
+endef
+
+MYSQL_CLIENT_POST_PATCH_HOOKS += MYSQL_CLIENT_FIX_SERVER
+
+define HOST_MYSQL_CLIENT_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define HOST_MYSQL_CLIENT_INSTALL_CMDS
+	cp $(@D)/sql/gen_lex_hash $(@D)/../mysql_client-$(MYSQL_CLIENT_VERSION)/sql/mysql-gen_lex_hash
+endef
+
+else
+MYSQL_CLIENT_CONF_OPT += --without-server
+endif
+
  define MYSQL_CLIENT_REMOVE_TEST_PROGS
  	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
  endef

@@ -45,3 +91,4 @@ 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))
+$(eval $(host-autotools-package))

package/mysql_client/mysql_server/mysql_client-crosscompiling.patch new file +23 -0

new file mode 100644
index 0000000..ab9454b
@@ -0,0 +1,23 @@
+--- mysql-5.1.70/sql/Makefile.am
++++ mysql-5.1.70.patch/sql/Makefile.am
+@@ -177,7 +177,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		./mysql-gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+
+ # For testing of udf_example.so
+
+--- mysql-5.1.70/sql/Makefile.in
++++ mysql-5.1.70.patch/sql/Makefile.in
+@@ -1310,7 +1310,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		./mysql-gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+
+ # We might have some stuff not built in this build, but that we want to install

Jerzy Grzegorek

2014-01-18 09:41 UTC #3 lore raw

PATCH 1/1 Update MySQL client package

In reply to Marcelo Gutiérrez(UTN/FRH)

Hi Marcelo,

Quoted 11 lines

From: Marcelo Gutierrez <[email protected]>
Added MySQL server support. The patches are based on buildroot-2013.11
Signed-off-by Marcelo Gutierrez (UTN/FRH) <[email protected]>
---
  package/mysql_client/Config.in                     |   12 ++++-
  package/mysql_client/S60mysqld                     |   25 +++++++++
  package/mysql_client/misc.m4.patch                 |   11 ++++
  package/mysql_client/mysql_client.mk               |   53 ++++++++++++++++++--
  .../mysql_server/mysql_client-crosscompiling.patch |   23 +++++++++

The patch files should be named <packagename>-<number>-<description>.patch Please use more descriptive patch names.

Regards,
Jerzy

Quoted 195 lines

  5 files changed, 119 insertions(+), 5 deletions(-)

create mode 100644 package/mysql_client/S60mysqld
create mode 100644 package/mysql_client/misc.m4.patch
create mode 100644 package/mysql_client/mysql_server/mysql_client-crosscompiling.patch

package/mysql_client/Config.in +10 -2

index 543bed1..1ee6067 100644
@@ -6,8 +6,16 @@ config BR2_PACKAGE_MYSQL_CLIENT
  	select BR2_PACKAGE_NCURSES
  	select BR2_PACKAGE_READLINE
  	help
-	  MySQL client
+	  The MySQL Open Source Database System
 
-comment "MySQL client needs a toolchain w/ C++, threads"
+comment "MySQL server and MySQL client needs a toolchain w/ C++, threads"
  	depends on BR2_USE_MMU
  	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+if BR2_PACKAGE_MYSQL_CLIENT
+	
+config BR2_PACKAGE_MYSQL_CLIENT_SERVER
+	bool "MySQL server"
+
+endif
+

package/mysql_client/S60mysqld new file +25 -0

new file mode 100644
index 0000000..38e1c41
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Starts mysqld.
+#
+
+case "$1" in
+	start)
+		/usr/bin/mysqld_safe &
+		;;
+	stop)
+		if test -f /var/lib/mysql/mysqld.pid ; then
+			PID=`cat /var/lib/mysql/mysqld.pid`
+			kill $PID
+		fi
+		;;
+	restart)
+		$0 stop
+		$0 start
+		;;
+	*)
+		echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
+		;;
+esac
+
+exit 0

package/mysql_client/misc.m4.patch new file +11 -0

new file mode 100644
index 0000000..afa23f2
@@ -0,0 +1,11 @@
+--- mysql-5.1.70.orig/config/ac-macros/misc.m4
++++ mysql-5.1.70/config/ac-macros/misc.m4
+@@ -477,7 +477,7 @@
+     exit(ptr_f(&a) < 0);
+   }
+   ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+-   ac_cv_c_stack_direction=)])
++   ac_cv_c_stack_direction=0)])
+  AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
+ ])dnl
+

package/mysql_client/mysql_client.mk +50 -3

index fe24ae7..c100eba 100644
@@ -4,15 +4,26 @@
  #
  ################################################################################
 
-MYSQL_CLIENT_VERSION = 5.1.70
+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-5.1
+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
 
+
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SERVER),y)
+MYSQL_CLIENT_DEPENDENCIES += host-mysql_client
+HOST_MYSQL_CLIENT_DEPENDENCIES =
+HOST_MYSQL_CLIENT_AUTORECONF = YES
+	
+HOST_MYSQL_CLIENT_CONF_OPT = \
+	--with-embedded-server
+endif
+
  MYSQL_CLIENT_CONF_ENV = \
  	ac_cv_sys_restartable_syscalls=yes \
  	ac_cv_path_PS=/bin/ps \

@@ -24,15 +35,50 @@ MYSQL_CLIENT_CONF_ENV = \
 
  MYSQL_CLIENT_CONF_OPT = \
  	--without-ndb-binlog \
-	--without-server \
  	--without-docs \
  	--without-man \
  	--without-libedit \
  	--without-readline \
+	--without-libedit \
+	--disable-dependency-tracking \
  	--with-low-memory \
+	--with-atomic-ops=up \
  	--enable-thread-safe-client \
+	--without-query-cache \
+	--without-plugin-partition \
+	--without-plugin-daemon_example \
+	--without-plugin-ftexample \
+	--without-plugin-archive \
+	--without-plugin-blackhole \
+	--without-plugin-example \
+	--without-plugin-federated \
+	--without-plugin-ibmdb2i \
+	--without-plugin-innobase \
+	--without-plugin-innodb_plugin \
+	--without-plugin-ndbcluster \
  	$(ENABLE_DEBUG)
 
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SERVER),y)
+	MYSQL_CLIENT_CONF_OPT += --with-embedded-server
+
+define MYSQL_CLIENT_FIX_SERVER
+	support/scripts/apply-patches.sh $(@D) package/mysql_client/mysql_server mysql_client-crosscompiling.patch
+endef
+
+MYSQL_CLIENT_POST_PATCH_HOOKS += MYSQL_CLIENT_FIX_SERVER
+
+define HOST_MYSQL_CLIENT_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define HOST_MYSQL_CLIENT_INSTALL_CMDS
+	cp $(@D)/sql/gen_lex_hash $(@D)/../mysql_client-$(MYSQL_CLIENT_VERSION)/sql/mysql-gen_lex_hash
+endef
+
+else
+MYSQL_CLIENT_CONF_OPT += --without-server
+endif
+
  define MYSQL_CLIENT_REMOVE_TEST_PROGS
  	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
  endef

@@ -45,3 +91,4 @@ 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))
+$(eval $(host-autotools-package))

package/mysql_client/mysql_server/mysql_client-crosscompiling.patch new file +23 -0

new file mode 100644
index 0000000..ab9454b
@@ -0,0 +1,23 @@
+--- mysql-5.1.70/sql/Makefile.am
++++ mysql-5.1.70.patch/sql/Makefile.am
+@@ -177,7 +177,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		./mysql-gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+
+ # For testing of udf_example.so
+
+--- mysql-5.1.70/sql/Makefile.in
++++ mysql-5.1.70.patch/sql/Makefile.in
+@@ -1310,7 +1310,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		./mysql-gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+
+ # We might have some stuff not built in this build, but that we want to install