openpkg/make.patch@9dacbd1d1aa2 (annotated)
openpkg/make.patch
Fri, 07 Sep 2012 19:08:07 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 07 Sep 2012 19:08:07 +0200
- changeset 667
- 9dacbd1d1aa2
- parent 250
- bda4f5eec616
- permissions
- -rw-r--r--
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
| 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 |
