openpkg/make.patch

Wed, 14 Jan 2009 15:59:12 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 14 Jan 2009 15:59:12 +0100
changeset 86
78e7deb1d6ab
child 250
bda4f5eec616
permissions
-rw-r--r--

Correct and improve many buildconf and code logic blocks. In particular:
1. Document potential problems building with current binutils releases.
2. Document the flawed webkit and explain its temporary exclusion.
3. Document the edition of Qt which is built and installed.
4. Remove the Solaris x11_supdir logic as it is no longer found.
5. Correct several .pr[io] files including QMAKE_CXXFLAGS and INCPATH,
which previously caused preexisting Qt installations to deliver
erroneous old include and library logic instead of relying on
that of the currently building package. -I/opkg/include is now
placed at the end of the compile statements.
6. Don't trust the QMAKE_[INC|LIB]DIR_X11 identifiers in qmake.conf.
7. Allow more 64-bit builds and more properly identify the platform.
8. Place plugins (which are shared objects) in lib instead of share.
9. Build components as plugins when possible if with_shared is enabled.
10. Translate German text to English to be more consistent.
11. Instead of removing the pkgconfig directory of with_shared builds,
place it in a child directory useful for shared building.
12. Document the nonstandard shared build directory structure,
including using the hidden pkgconfig directory (PKG_CONFIG_PATH.)
13. Change %doc to specify files rather than directories in the RPM DB.

     1 Index: glob/glob.c
     2 --- glob/glob.c.orig	2006-03-10 03:20:45 +0100
     3 +++ glob/glob.c	2006-04-01 19:09:18 +0200
     4 @@ -216,13 +216,13 @@
     5  #  ifdef HAVE_ALLOCA_H
     6  #   include <alloca.h>
     7  #  else	/* Not HAVE_ALLOCA_H.  */
     8 -#   ifndef _AIX
     9 +#   if !defined (_AIX) && !defined (__FreeBSD__)
    10  #    ifdef WINDOWS32
    11  #     include <malloc.h>
    12  #    else
    13  extern char *alloca ();
    14  #    endif /* WINDOWS32 */
    15 -#   endif /* Not _AIX.  */
    16 +#   endif /* Not _AIX && not __FreeBSD__.  */
    17  #  endif /* sparc or HAVE_ALLOCA_H.  */
    18  # endif	/* GCC.  */
    20 Index: make.h
    21 --- make.h.orig	2006-02-16 00:54:43 +0100
    22 +++ make.h	2006-04-01 19:09:18 +0200
    23 @@ -31,7 +31,7 @@
    24  #  ifdef _AIX
    25   #pragma alloca
    26  #  else
    27 -#   ifndef alloca /* predefined by HP cc +Olibcalls */
    28 +#   if !defined (alloca) && !defined (__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */
    29  char *alloca ();
    30  #   endif
    31  #  endif

mercurial