mysql: build needed host files instead of copying them as a compressed package in the mysql source folder; update patches

- thanks @st-ty1

release/src-rt-6.x.4708/router/Makefile

@@ -2248,8 +2248,28 @@ libncurses-install:
 		ln -sf libmenu.so.6 libmenu.so
 
 mysql/stamp-h1: $(OPENSSLDIR) zlib libncurses
-	@cp -f $(TOP)/patches/mysql/.host.tgz $(TOP)/mysql/ || true
+	cd mysql && \
+		CC=$(CC:$(CROSS_COMPILE)%=%) CXX=$(CXX:$(CROSS_COMPILE)%=%) AR=$(AR:$(CROSS_COMPILE)%=%) RANLIB=$(RANLIB:$(CROSS_COMPILE)%=%) \
+		NM=$(NM:$(CROSS_COMPILE)%=%) LD=$(LD:$(CROSS_COMPILE)%=%) OBJDUMP=$(OBJDUMP:$(CROSS_COMPILE)%=%) CFLAGS="" CPPFLAGS="" \
+		./configure
+	@cp mysql/include/config.h mysql/include/my_config.h
+
+	@$(MAKE) -C mysql/vio
+	@$(MAKE) -C mysql/mysys
+	@$(MAKE) -C mysql/strings
+	@$(MAKE) -C mysql/dbug
+	@$(MAKE) -C mysql/regex
+	@$(MAKE) -C mysql/sql gen_lex_hash
+	@$(MAKE) -C mysql/scripts comp_sql
+	@$(MAKE) -C mysql/extra comp_err
+
+	@mkdir -p mysql/host
+	@cp -vf mysql/sql/gen_lex_hash mysql/scripts/comp_sql mysql/extra/comp_err mysql/host
+	@$(MAKE) -C mysql clean
+	@rm -f mysql/configure
+
 	$(call patch_files,mysql)
+	@chmod 0755 mysql/configure
 	cd mysql && \
 		CFLAGS="-O2 -Wall $(EXTRACFLAGS) -fno-delete-null-pointer-checks -funit-at-a-time --param large-function-growth=800 \
 			--param max-inline-insns-single=3000 -ffunction-sections -fdata-sections -fPIC -I$(TOP)/zlib \
@@ -2258,7 +2278,7 @@ mysql/stamp-h1: $(OPENSSLDIR) zlib libncurses
 			--param max-inline-insns-single=3000 -ffunction-sections -fdata-sections -fPIC -I$(TOP)/zlib \
 			-I$(TOP)/$(OPENSSLDIR)/staged/usr/include -I$(TOP)/libncurses/include" \
 		LDFLAGS="-L$(TOP)/$(OPENSSLDIR)/staged/usr/lib -L$(TOP)/zlib/staged/usr/lib -L$(TOP)/libncurses/lib -fPIC" \
-		LIBS="-lcrypt -lz -lstdc++ -lssl -lcrypto -lncurses" \
+		LIBS="-lcrypt -lz -lstdc++ -lssl -lcrypto -lncurses -lpthread" \
 		$(CONFIGURE) --prefix=/usr \
 			--without-debug --without-docs --without-man --with-charset=utf8 --with-extra-charsets=ascii,latin1,gb2312,gbk \
 			--enable-shared --disable-static \
@@ -2271,7 +2291,6 @@ mysql/stamp-h1: $(OPENSSLDIR) zlib libncurses
 			--enable-assembler \
 			--with-zlib-dir="$(TOP)/zlib/staged/usr" \
 			ac_cv_c_stack_direction=-1
-	cd mysql && tar xvfz .host.tgz
 	@touch $@
 
 mysql: mysql/stamp-h1
@@ -2323,7 +2342,7 @@ mysql-install:
 
 mysql-clean:
 	-@$(MAKE) -C mysql clean
-	@rm -f mysql/stamp-h1 mysql/.host.tgz
+	@rm -f mysql/stamp-h1
 	@rm -rf mysql/staged mysql/host
 	$(call unpatch_files,mysql)
 

release/src-rt-6.x.4708/router/patches/mysql/201-fix-cross-compiling.patch

@@ -1,5 +1,5 @@
---- mysql/extra/Makefile.am	2013-11-04 19:52:27.000000000 +0100
-+++ mysql/extra/Makefile.am	2017-09-28 17:27:10.000000000 +0200
+--- mysql/extra/Makefile.am
++++ mysql/extra/Makefile.am
 @@ -32,7 +32,7 @@ DIST_SUBDIRS =		yassl
  $(top_builddir)/include/mysqld_error.h: comp_err.c \
  			$(top_srcdir)/sql/share/errmsg.txt
@@ -9,8 +9,8 @@
  	--charset=$(top_srcdir)/sql/share/charsets \
  	--out-dir=$(top_builddir)/sql/share/ \
  	--header_file=$(top_builddir)/include/mysqld_error.h \
---- mysql/extra/Makefile.in	2013-11-04 19:54:57.000000000 +0100
-+++ mysql/extra/Makefile.in	2017-10-03 19:58:43.000000000 +0200
+--- mysql/extra/Makefile.in
++++ mysql/extra/Makefile.in
 @@ -938,7 +938,7 @@ uninstall-am: uninstall-binPROGRAMS unin
  $(top_builddir)/include/mysqld_error.h: comp_err.c \
  			$(top_srcdir)/sql/share/errmsg.txt
@@ -20,8 +20,8 @@
  	--charset=$(top_srcdir)/sql/share/charsets \
  	--out-dir=$(top_builddir)/sql/share/ \
  	--header_file=$(top_builddir)/include/mysqld_error.h \
---- mysql/include/my_global.h	2013-11-04 19:52:27.000000000 +0100
-+++ mysql/include/my_global.h	2017-09-28 17:27:10.000000000 +0200
+--- mysql/include/my_global.h
++++ mysql/include/my_global.h
 @@ -894,6 +894,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
  #endif /* isfinite */
  
@@ -30,8 +30,8 @@
  #define isnan(x) ((x) != (x))
  #endif
  
---- mysql/scripts/Makefile.am	2013-11-04 19:52:27.000000000 +0100
-+++ mysql/scripts/Makefile.am	2017-09-28 17:27:12.000000000 +0200
+--- mysql/scripts/Makefile.am
++++ mysql/scripts/Makefile.am
 @@ -121,7 +121,7 @@ mysql_fix_privilege_tables.sql: mysql_sy
  mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
  	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
@@ -41,8 +41,8 @@
  	  mysql_fix_privilege_tables \
  	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
  
---- mysql/scripts/Makefile.in	2013-11-04 19:55:01.000000000 +0100
-+++ mysql/scripts/Makefile.in	2017-10-03 19:58:44.000000000 +0200
+--- mysql/scripts/Makefile.in
++++ mysql/scripts/Makefile.in
 @@ -804,7 +804,7 @@ mysql_fix_privilege_tables.sql: mysql_sy
  mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
  	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
@@ -52,8 +52,8 @@
  	  mysql_fix_privilege_tables \
  	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
  
---- mysql/sql/Makefile.am	2013-11-04 19:52:27.000000000 +0100
-+++ mysql/sql/Makefile.am	2017-09-28 17:27:12.000000000 +0200
+--- mysql/sql/Makefile.am
++++ mysql/sql/Makefile.am
 @@ -177,7 +177,7 @@ link_sources:
  # this avoid the rebuild of the built files in a source dist
  lex_hash.h:	gen_lex_hash.cc lex.h
@@ -63,8 +63,8 @@
  		$(MV) $@-t $@
  
  # For testing of udf_example.so
---- mysql/sql/Makefile.in	2013-11-04 19:55:02.000000000 +0100
-+++ mysql/sql/Makefile.in	2017-10-03 19:58:44.000000000 +0200
+--- mysql/sql/Makefile.in
++++ mysql/sql/Makefile.in
 @@ -1310,7 +1310,7 @@ link_sources:
  # this avoid the rebuild of the built files in a source dist
  lex_hash.h:	gen_lex_hash.cc lex.h

release/src-rt-6.x.4708/router/patches/mysql/202-fix-cross-compiling2.patch

@@ -1,5 +1,5 @@
---- mysql/configure	2013-11-04 19:55:16.000000000 +0100
-+++ mysql/configure	2017-09-28 17:27:10.000000000 +0200
+--- mysql/configure
++++ mysql/configure
 @@ -26300,13 +26300,14 @@ if test "${ac_cv_sys_restartable_syscall
    $as_echo_n "(cached) " >&6
  else
@@ -11,7 +11,7 @@
 -$as_echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
-+$as_echo "Skipping...! bwq518"
++$as_echo "Skipping...!"
 +#  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +#{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -42,7 +42,7 @@
 -$as_echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
-+$as_echo "Skipping...! bwq518"
++$as_echo "Skipping...!"
 +#  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +#{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -64,7 +64,7 @@
 -$as_echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
-+$as_echo "Skipping...! bwq518"
++$as_echo "Skipping...!"
 +#  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +#{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -86,7 +86,7 @@
 -$as_echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }; }
-+$as_echo "Skipping...! bwq518"
++$as_echo "Skipping...!"
 +#  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +#{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling