rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
bsp/buildroot/package/oracle-mysql/0008-gcc7.patch Normal file
View File

@@ -0,0 +1,45 @@
Fix gcc7 compile
mysql.cc: In function 'void build_completion_hash(bool, bool)':
mysql.cc:2687:37: error: invalid conversion from 'char' to 'char*' [-fpermissive]
field_names[i][num_fields*2]= '\0';
^~~~
Patch was partly backported from upstream commit:
https://github.com/mysql/mysql-server/commit/ae21683d980d5fe9e39bd0193827ea3604256eb9
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Thomas: add more gcc 7.x fixes in instance_map.cc.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/client/mysql.cc
===================================================================
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2684,7 +2684,7 @@
mysql_free_result(fields);
break;
}
- field_names[i][num_fields*2]= '\0';
+ field_names[i][num_fields*2]= NULL;
j=0;
while ((sql_field=mysql_fetch_field(fields)))
{
Index: b/server-tools/instance-manager/instance_map.cc
===================================================================
--- a/server-tools/instance-manager/instance_map.cc
+++ b/server-tools/instance-manager/instance_map.cc
@@ -526,12 +526,12 @@
Options::Main::config_file);
argv_options[1]= defaults_file_arg;
- argv_options[2]= '\0';
+ argv_options[2]= NULL;
argc= 2;
}
else
- argv_options[1]= '\0';
+ argv_options[1]= NULL;
/*
If the routine failed, we'll simply fallback to defaults in

5
bsp/buildroot/package/oracle-mysql/oracle-mysql.mk
View File

@@ -11,7 +11,7 @@ ORACLE_MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(ORACLE_MYSQL_VERS
ORACLE_MYSQL_INSTALL_STAGING = YES
ORACLE_MYSQL_DEPENDENCIES = readline ncurses
ORACLE_MYSQL_AUTORECONF = YES
ORACLE_MYSQL_LICENSE = GPLv2
ORACLE_MYSQL_LICENSE = GPL-2.0
ORACLE_MYSQL_LICENSE_FILES = README COPYING
ORACLE_MYSQL_PROVIDES = mysql
@@ -58,7 +58,7 @@ define HOST_ORACLE_MYSQL_BUILD_CMDS
endef
define HOST_ORACLE_MYSQL_INSTALL_CMDS
$(INSTALL) -m 0755 $(@D)/sql/gen_lex_hash $(HOST_DIR)/usr/bin/
$(INSTALL) -m 0755 $(@D)/sql/gen_lex_hash $(HOST_DIR)/bin/
endef
ifeq ($(BR2_PACKAGE_OPENSSL),y)
@@ -125,7 +125,6 @@ ORACLE_MYSQL_CONF_OPTS += \
--without-server
endif
define ORACLE_MYSQL_REMOVE_TEST_PROGS
rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
endef