summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-05-10 18:54:00 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-08-27 16:39:31 +0100
commit72e23c12296fbc77193898c38426add58d0c2d71 (patch)
treeeed39116603d211504dabf316db4d42970b89871 /meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
parent336123c49e3d9a16429150dd96f60d423ccbd77b (diff)
downloadmeta-openembedded-72e23c12296fbc77193898c38426add58d0c2d71.tar.gz
mysql5: replace with mariadb 5.1.67 and tweak
Switch to MariaDB (which is a drop-in replacement for MySQL) and use the latest stable release from the 5.1 series. * Update LIC_FILES_CHKSUM due to reformatted GPLv2 license text with updated FSF address * Refresh patches * Add two patches from the upstream 5.1 branch to fix CVE-2013-1861 * Add a package for libmysqld (the embedded server library) * Disable "maria" plugin since this fails to compile and doesn't appear to be critical * Drop some unrecognised/redundant options from EXTRA_OECONF * Fix text relocation QA warnings introduced in the upgrade * Convert to use useradd.bbclass for creating mysql user * Set SUMMARY instead of description * Move SRC_URI checksums to the version-specific inc file * Clear out cruft in files/ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch')
-rw-r--r--meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch77
1 files changed, 0 insertions, 77 deletions
diff --git a/meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch b/meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
deleted file mode 100644
index 58812c1f1a..0000000000
--- a/meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
+++ /dev/null
@@ -1,77 +0,0 @@
1From: Date: July 20 2010 7:44pm
2Subject: bzr commit into mysql-5.1-bugteam branch (davi:3493) Bug#52514
3List-Archive: http://lists.mysql.com/commits/113968
4X-Bug: 52514
5MIME-Version: 1.0
6Content-Type: multipart/mixed; boundary="===============9147207462624717749=="
7
8--===============9147207462624717749==
9MIME-Version: 1.0
10Content-Type: text/plain; charset="us-ascii"
11Content-Transfer-Encoding: 7bit
12Content-Disposition: inline
13
14# At a local mysql-5.1-bugteam repository of davi
15
16 3493 Davi Arnaut 2010-07-20
17 Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5
18 due to GCC preprocessor change
19
20 The problem is that newer GCC versions treats missing headers
21 as fatal errors. The solution is to use a guard macro to prevent
22 the inclusion of system headers when checking the ABI with the
23 C Preprocessor.
24
25 Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15638
26 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44836
27 @ Makefile.am
28 Define guard macro.
29 @ configure.in
30 Remove workaround.
31 @ include/mysql.h
32 Guard the header inclusion.
33 @ include/mysql.h.pp
34 Header is not included anymore.
35
36 modified:
37 Makefile.am
38 configure.in
39 include/mysql.h
40 include/mysql.h.pp
41=== modified file 'Makefile.am'
42Index: mysql-5.1.40/Makefile.am
43===================================================================
44--- mysql-5.1.40.orig/Makefile.am 2009-10-07 01:46:13.000000000 +0800
45+++ mysql-5.1.40/Makefile.am 2010-08-17 20:07:24.843148001 +0800
46@@ -312,7 +312,7 @@
47 do_abi_check:
48 set -ex; \
49 for file in $(abi_headers); do \
50- @CC@ -E -nostdinc -dI \
51+ @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
52 -I$(top_srcdir)/include \
53 -I$(top_srcdir)/include/mysql \
54 -I$(top_srcdir)/sql \
55Index: mysql-5.1.40/include/mysql.h
56===================================================================
57--- mysql-5.1.40.orig/include/mysql.h 2009-10-07 01:46:50.000000000 +0800
58+++ mysql-5.1.40/include/mysql.h 2010-08-17 20:07:24.843148001 +0800
59@@ -44,7 +44,9 @@
60 #endif
61
62 #ifndef _global_h /* If not standard header */
63+#ifndef MYSQL_ABI_CHECK
64 #include <sys/types.h>
65+#endif
66 #ifdef __LCC__
67 #include <winsock2.h> /* For windows */
68 #endif
69Index: mysql-5.1.40/include/mysql.h.pp
70===================================================================
71--- mysql-5.1.40.orig/include/mysql.h.pp 2009-10-07 01:46:50.000000000 +0800
72+++ mysql-5.1.40/include/mysql.h.pp 2010-08-17 20:07:24.843148001 +0800
73@@ -1,4 +1,3 @@
74-#include <sys/types.h>
75 typedef char my_bool;
76 typedef int my_socket;
77 #include "mysql_version.h"