openpkg/make.patch@3b08e6396b45 (annotated)
openpkg/make.patch
Tue, 28 Aug 2012 18:28:45 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:28:45 +0200
- changeset 528
- 3b08e6396b45
- parent 250
- bda4f5eec616
- permissions
- -rw-r--r--
Massively update from 5.1 to 5.5 release, completely changing from
autotools to cmake build configuration along with the corresponding
corrections. Correct some less important problems like typical german
english mistakes, as well as use parallel make for faster builds with
SMP and multicore architectures. Warning, the 5.5 releases of MySQL
seem to be equally bug ridden as the 5.1 are, for example building
the NDBCluster storage engine fails.
| michael@13 | 1 | Index: glob/glob.c |
| michael@428 | 2 | --- glob/glob.c.orig 2009-09-28 08:46:03.000000000 +0200 |
| michael@428 | 3 | +++ glob/glob.c 2010-07-29 14:25:40.000000000 +0200 |
| michael@250 | 4 | @@ -217,13 +217,13 @@ |
| michael@13 | 5 | # ifdef HAVE_ALLOCA_H |
| michael@13 | 6 | # include <alloca.h> |
| michael@13 | 7 | # else /* Not HAVE_ALLOCA_H. */ |
| michael@13 | 8 | -# ifndef _AIX |
| michael@13 | 9 | +# if !defined (_AIX) && !defined (__FreeBSD__) |
| michael@13 | 10 | # ifdef WINDOWS32 |
| michael@13 | 11 | # include <malloc.h> |
| michael@13 | 12 | # else |
| michael@13 | 13 | extern char *alloca (); |
| michael@13 | 14 | # endif /* WINDOWS32 */ |
| michael@13 | 15 | -# endif /* Not _AIX. */ |
| michael@13 | 16 | +# endif /* Not _AIX && not __FreeBSD__. */ |
| michael@13 | 17 | # endif /* sparc or HAVE_ALLOCA_H. */ |
| michael@13 | 18 | # endif /* GCC. */ |
| michael@13 | 19 | |
| michael@13 | 20 | Index: make.h |
| michael@428 | 21 | --- make.h.orig 2010-07-20 15:12:06.000000000 +0200 |
| michael@428 | 22 | +++ make.h 2010-07-29 14:27:20.000000000 +0200 |
| michael@250 | 23 | @@ -36,7 +36,7 @@ |
| michael@13 | 24 | #pragma alloca |
| michael@250 | 25 | # else |
| michael@250 | 26 | # if !defined(__GNUC__) && !defined(WINDOWS32) |
| michael@13 | 27 | -# ifndef alloca /* predefined by HP cc +Olibcalls */ |
| michael@428 | 28 | +# if !defined(alloca) && !defined(__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */ |
| michael@13 | 29 | char *alloca (); |
| michael@13 | 30 | # endif |
| michael@13 | 31 | # endif |
