openpkg/make.patch@4ecfc2416fd8 (annotated)
openpkg/make.patch
Tue, 29 Mar 2011 19:46:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 29 Mar 2011 19:46:35 +0200
- changeset 333
- 4ecfc2416fd8
- parent 13
- cb59d6afeb61
- child 428
- f880f219c566
- permissions
- -rw-r--r--
Correct and introduce slightly needed logic, leading to better reliability:
Update bash(1) patch logic, correct several buildconf make location
errors, correct failed bash(1) configure invocation, enable perl(1) to
build with unpathed make(1), patch rpm(1) to correctly link with
internal libdb(3), and lastly unsuscessfully try to reorganize rpm patch
hunks.
| michael@13 | 1 | Index: glob/glob.c |
| michael@250 | 2 | diff -Nau glob/glob.c.orig glob/glob.c |
| michael@13 | 3 | --- glob/glob.c.orig 2006-03-10 03:20:45 +0100 |
| michael@13 | 4 | +++ glob/glob.c 2006-04-01 19:09:18 +0200 |
| michael@250 | 5 | @@ -217,13 +217,13 @@ |
| michael@13 | 6 | # ifdef HAVE_ALLOCA_H |
| michael@13 | 7 | # include <alloca.h> |
| michael@13 | 8 | # else /* Not HAVE_ALLOCA_H. */ |
| michael@13 | 9 | -# ifndef _AIX |
| michael@13 | 10 | +# if !defined (_AIX) && !defined (__FreeBSD__) |
| michael@13 | 11 | # ifdef WINDOWS32 |
| michael@13 | 12 | # include <malloc.h> |
| michael@13 | 13 | # else |
| michael@13 | 14 | extern char *alloca (); |
| michael@13 | 15 | # endif /* WINDOWS32 */ |
| michael@13 | 16 | -# endif /* Not _AIX. */ |
| michael@13 | 17 | +# endif /* Not _AIX && not __FreeBSD__. */ |
| michael@13 | 18 | # endif /* sparc or HAVE_ALLOCA_H. */ |
| michael@13 | 19 | # endif /* GCC. */ |
| michael@13 | 20 | |
| michael@13 | 21 | Index: make.h |
| michael@250 | 22 | diff -Nau make.h.orig make.h |
| michael@13 | 23 | --- make.h.orig 2006-02-16 00:54:43 +0100 |
| michael@13 | 24 | +++ make.h 2006-04-01 19:09:18 +0200 |
| michael@250 | 25 | @@ -36,7 +36,7 @@ |
| michael@13 | 26 | #pragma alloca |
| michael@250 | 27 | # else |
| michael@250 | 28 | # if !defined(__GNUC__) && !defined(WINDOWS32) |
| michael@13 | 29 | -# ifndef alloca /* predefined by HP cc +Olibcalls */ |
| michael@13 | 30 | +# if !defined (alloca) && !defined (__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */ |
| michael@13 | 31 | char *alloca (); |
| michael@13 | 32 | # endif |
| michael@13 | 33 | # endif |
