diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
commit | c58cc7d3796dcee6e93885c835ed04cb566abeb2 (patch) | |
tree | 3eea4d4ef6a4ef79e0f4e025d7012c1a5cc38835 /meta-oe/recipes-support/mysql/mysql5/configure.in.patch | |
parent | eec6ab97f712e06eb52c9f7c99e19ffab3ce9d74 (diff) | |
download | meta-openembedded-c58cc7d3796dcee6e93885c835ed04cb566abeb2.tar.gz |
move layer into meta-oe in preparation for future splits
As per TSC decision
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/mysql/mysql5/configure.in.patch')
-rw-r--r-- | meta-oe/recipes-support/mysql/mysql5/configure.in.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/mysql/mysql5/configure.in.patch b/meta-oe/recipes-support/mysql/mysql5/configure.in.patch new file mode 100644 index 0000000000..3edc5f3c21 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mysql5/configure.in.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | Index: 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 | |||