package/oracle-mysql: renumber patch
PATCH 1/2 package/oracle-mysql: renumber patch
Renumber patch added by commit 94bad4fbf5759302a9f8f33267989d543f3a1167
---
package/oracle-mysql/{0008-gcc7.patch => 0009-gcc7.patch} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename package/oracle-mysql/{0008-gcc7.patch => 0009-gcc7.patch} (100%)package/oracle-mysql/0009-gcc7.patch renamed from package/oracle-mysql/0008-gcc7.patch +0 -0
Signature · 1 line
2.27.0
PATCH 2/2 package/oracle-mysql: don't use bundled zlib
As spotted by Thomas Petazzoni during review of
https://patchwork.ozlabs.org/project/buildroot/patch/20200713215943.2240412-1-fontaine.fabrice at gmail.com, oracle-mysql uses its bundled version of zlib if it is not found on the
system
So explictly disable zlib if needed and add a patch fixing build failures without it
--- .../0010-fix-build-without-zlib.patch | 50 +++++++++++++++++++ package/oracle-mysql/oracle-mysql.mk | 3 ++ 2 files changed, 53 insertions(+) create mode 100644 package/oracle-mysql/0010-fix-build-without-zlib.patch
package/oracle-mysql/0010-fix-build-without-zlib.patch new file +50 -0
@@ -0,0 +1,50 @@ +fix build without zlib + +Don't include unconditionally zlib.h + +Signed-off-by: Fabrice Fontaine <[email protected]> +diff -durN mysql-5.1.73.orig/mysys/checksum.c mysql-5.1.73/mysys/checksum.c +--- mysql-5.1.73.orig/mysys/checksum.c 2020-07-14 17:34:38.212304432 +0200 ++++ mysql-5.1.73/mysys/checksum.c 2020-07-14 18:06:45.076342493 +0200 +@@ -16,7 +16,9 @@ + + #include <my_global.h> + #include <my_sys.h> ++#ifdef HAVE_COMPRESS + #include <zlib.h> ++#endif + + /* + Calculate a long checksum for a memoryblock. +diff -durN mysql-5.1.73.orig/sql/item_strfunc.cc mysql-5.1.73/sql/item_strfunc.cc +--- mysql-5.1.73.orig/sql/item_strfunc.cc 2020-07-14 17:34:38.160304431 +0200 ++++ mysql-5.1.73/sql/item_strfunc.cc 2020-07-14 18:04:36.956339962 +0200 +@@ -35,7 +35,9 @@ + #include "my_md5.h" + #include "sha1.h" + #include "my_aes.h" ++#ifdef HAVE_COMPRESS + #include <zlib.h> ++#endif + C_MODE_START + #include "../mysys/my_static.h" // For soundex_map + C_MODE_END +diff -durN mysql-5.1.73.orig/sql/sql_table.cc mysql-5.1.73/sql/sql_table.cc +--- mysql-5.1.73.orig/sql/sql_table.cc 2020-07-14 17:34:38.156304431 +0200 ++++ mysql-5.1.73/sql/sql_table.cc 2020-07-14 18:14:48.628352044 +0200 +@@ -1681,6 +1681,7 @@ + goto end; + } + } ++#ifdef HAVE_COMPRESS + if (flags & WFRM_PACK_FRM) + { + /* +@@ -1702,6 +1703,7 @@ + } + error= my_delete(shadow_frm_name, MYF(MY_WME)); + } ++#endif + if (flags & WFRM_INSTALL_SHADOW) + { + #ifdef WITH_PARTITION_STORAGE_ENGINE
package/oracle-mysql/oracle-mysql.mk +3 -0
@@ -68,6 +68,9 @@ endif ifeq ($(BR2_PACKAGE_ZLIB),y) ORACLE_MYSQL_DEPENDENCIES += zlib +ORACLE_MYSQL_CONF_OPTS += --with-zlib-dir=$(STAGING_DIR)/usr +else +ORACLE_MYSQL_CONF_OPTS += --without-zlib-dir endif ifeq ($(BR2_PACKAGE_ORACLE_MYSQL_SERVER),y)
Signature · 1 line
2.27.0
PATCH 2/2 package/oracle-mysql: don't use bundled zlib
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
As spotted by Thomas Petazzoni during review of
https://patchwork.ozlabs.org/project/buildroot/patch/20200713215943.2240412-1-fontaine.fabrice at gmail.com, oracle-mysql uses its bundled version of zlib if it is not found on the
systemSo explictly disable zlib if needed and add a patch fixing build failures without it
Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/oracle-mysql: renumber patch
In reply to Fabrice FontaineQuoted 7 lines · On Tue, 14 Jul 2020 18:31:51 +0200 Fabrice Fontaine…
Renumber patch added by commit
94bad4fbf5759302a9f8f33267989d543f3a1167Signed-off-by Fabrice Fontaine <[email protected]>--- package/oracle-mysql/{0008-gcc7.patch => 0009-gcc7.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/oracle-mysql/{0008-gcc7.patch => 0009-gcc7.patch} (100%)
Both applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/2 package/oracle-mysql: renumber patch
In reply to Fabrice FontaineQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Renumber patch added by commit
94bad4fbf5759302a9f8f33267989d543f3a1167Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard