openpkg/make.patch@f4a0b439d0fb
openpkg/make.patch
Fri, 15 Oct 2010 19:06:09 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 15 Oct 2010 19:06:09 +0200
- changeset 263
- f4a0b439d0fb
- parent 13
- cb59d6afeb61
- child 428
- f880f219c566
- permissions
- -rw-r--r--
Correct shared library and plugin link logic, as well as informal text.
Update file server URL, update build resource estimations, correct RPATH
logic, allow for qmake(1) static to shared library changes via CONFIG
argument, correct documentation broken title and index links, correct
shared library install path, install only one set of (correct) plugins,
install the designer shared library (as required by QtCreator), announce
features related to shared linking using qmake(1), and correclty
substitute hard coded paths in prl and la library files.
1 Index: glob/glob.c
2 diff -Nau glob/glob.c.orig glob/glob.c
3 --- glob/glob.c.orig 2006-03-10 03:20:45 +0100
4 +++ glob/glob.c 2006-04-01 19:09:18 +0200
5 @@ -217,13 +217,13 @@
6 # ifdef HAVE_ALLOCA_H
7 # include <alloca.h>
8 # else /* Not HAVE_ALLOCA_H. */
9 -# ifndef _AIX
10 +# if !defined (_AIX) && !defined (__FreeBSD__)
11 # ifdef WINDOWS32
12 # include <malloc.h>
13 # else
14 extern char *alloca ();
15 # endif /* WINDOWS32 */
16 -# endif /* Not _AIX. */
17 +# endif /* Not _AIX && not __FreeBSD__. */
18 # endif /* sparc or HAVE_ALLOCA_H. */
19 # endif /* GCC. */
21 Index: make.h
22 diff -Nau make.h.orig make.h
23 --- make.h.orig 2006-02-16 00:54:43 +0100
24 +++ make.h 2006-04-01 19:09:18 +0200
25 @@ -36,7 +36,7 @@
26 #pragma alloca
27 # else
28 # if !defined(__GNUC__) && !defined(WINDOWS32)
29 -# ifndef alloca /* predefined by HP cc +Olibcalls */
30 +# if !defined (alloca) && !defined (__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */
31 char *alloca ();
32 # endif
33 # endif
