Commit f7aa61c6 authored by Marcelo Gutierrez's avatar Marcelo Gutierrez Committed by Thomas Petazzoni
Browse files

mysql: add option to build the server 



Signed-off-by: default avatarMarcelo Gutierrez (UTN/FRH) <kuyurix@gmail.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 5412b62d

package/mysql/Config.in

+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,15 @@ config BR2_PACKAGE_MYSQL 


	  http://www.mysql.com/



if BR2_PACKAGE_MYSQL



config BR2_PACKAGE_MYSQL_SERVER

	bool "MySQL server"

	help

	  Install the MySQL server on the target.



endif



comment "MySQL needs a toolchain w/ C++, threads"

	depends on BR2_USE_MMU

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

package/mysql/mysql-0003-ac_stack_direction-is-unset.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
misc.m4: ac_cv_c_stack_direction is unset.



Signed-off-by: Marcelo Gutierrez (UTN/FRH) <kuyurix@gmail.com>



--- 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/mysql-0004-Fix-gen_lex_hash-execution.patch

0 → 100644
+32 −0
Original line number Diff line number Diff line 
Makefile: fix cross-compiling the server



MySQL Makefile believes it can run code it just compiled, to

generate a header. This does not work for cross-compilation.



Instead, use a pre-installed host-version of the required tool.



Signed-off-by: Marcelo Gutierrez (UTN/FRH) <kuyurix@gmail.com>



--- 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

+		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

+		gen_lex_hash$(EXEEXT) > $@-t

 		$(MV) $@-t $@

 

 # We might have some stuff not built in this build, but that we want to install

package/mysql/mysql-0005-bison_3_breaks_mysql_server_build.patch

0 → 100644
+3310 −0

File added.

Preview size limit exceeded, changes collapsed.

package/mysql/mysql.mk

+45 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ MYSQL_CONF_ENV = \ 


MYSQL_CONF_OPT = \

	--without-ndb-binlog \

	--without-server \

	--without-docs \

	--without-man \

	--without-libedit \
@@ -34,6 +33,50 @@ MYSQL_CONF_OPT = \ 
	--enable-thread-safe-client \

	$(ENABLE_DEBUG)



ifeq ($(BR2_PACKAGE_MYSQL_SERVER),y)

MYSQL_DEPENDENCIES += host-mysql host-bison

HOST_MYSQL_DEPENDENCIES =



HOST_MYSQL_CONF_OPT = \

	--with-embedded-server



MYSQL_CONF_OPT += \

	--disable-dependency-tracking \

	--with-atomic-ops=up \

	--with-embedded-server \

	--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



define HOST_MYSQL_BUILD_CMDS

	$(MAKE) -C $(@D)/include my_config.h

	$(MAKE) -C $(@D)/mysys libmysys.a

	$(MAKE) -C $(@D)/strings libmystrings.a

	$(MAKE) -C $(@D)/vio libvio.a

	$(MAKE) -C $(@D)/dbug libdbug.a

	$(MAKE) -C $(@D)/regex libregex.a

	$(MAKE) -C $(@D)/sql gen_lex_hash

endef



define HOST_MYSQL_INSTALL_CMDS

	$(INSTALL) -m 0755  $(@D)/sql/gen_lex_hash  $(HOST_DIR)/usr/bin/

endef



else

MYSQL_CONF_OPT += \

	--without-server

endif





define MYSQL_REMOVE_TEST_PROGS

	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench

endef
@@ -46,3 +89,4 @@ MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_REMOVE_TEST_PROGS 
MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_ADD_MYSQL_LIB_PATH



$(eval $(autotools-package))

$(eval $(host-autotools-package))