summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/mysql/mysql5/configure.in.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/configure.in.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/configure.in.patch')
-rw-r--r--meta-oe/recipes-support/mysql/mysql5/configure.in.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/meta-oe/recipes-support/mysql/mysql5/configure.in.patch b/meta-oe/recipes-support/mysql/mysql5/configure.in.patch
deleted file mode 100644
index 3edc5f3c21..0000000000
--- a/meta-oe/recipes-support/mysql/mysql5/configure.in.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1Index: mysql-5.1.40/configure.in
2===================================================================
3--- mysql-5.1.40.orig/configure.in
4+++ mysql-5.1.40/configure.in
5@@ -226,8 +226,6 @@ else
6 AC_PATH_PROG(AS, as, as)
7 fi
8
9-# Still need ranlib for readline; local static use only so no libtool.
10-AC_PROG_RANLIB
11 # We use libtool
12 #AC_LIBTOOL_WIN32_DLL
13 AC_PROG_LIBTOOL
14@@ -255,39 +253,7 @@ AC_CHECK_PROGS(YACC, ['bison -y -p MYSQL
15 AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
16 AC_CHECK_PROG(DVIS, tex, manual.dvi)
17
18-#check the return type of sprintf
19-AC_MSG_CHECKING("return type of sprintf")
20-AC_TRY_RUN([
21- int main()
22- {
23- char* s = "hello";
24- char buf[6];
25- if((int)sprintf(buf, s) == strlen(s))
26- return 0;
27-
28- return -1;
29- }
30- ],
31- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
32- AC_MSG_RESULT("int")],
33- [AC_TRY_RUN([
34- int main()
35- {
36- char* s = "hello";
37- char buf[6];
38- if((char*)sprintf(buf,s) == buf + strlen(s))
39- return 0;
40- return -1;
41- } ],
42- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
43- AC_MSG_RESULT("ptr")],
44- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
45- AC_MSG_RESULT("garbage")]
46- )],
47- # Cross compile, assume POSIX
48- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
49- AC_MSG_RESULT("int (we assume)")]
50-)
51+MYSQL_SPRINTF_RET
52
53 AC_PATH_PROG(uname_prog, uname, no)
54