Correct various defects in the build configuration including:

Fri, 03 Aug 2012 15:21:22 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 03 Aug 2012 15:21:22 +0200
changeset 455
eb5f1f7ac5ff
parent 454
e99334bd789c
child 456
f243ce94972c

Correct various defects in the build configuration including:
Improve SVR5 portability, support nonpkgconfig libelf(3), debug
recently introduced upstream gresource code, and use parallel make.

glib/glib.patch file | annotate | diff | comparison | revisions
glib/glib.spec file | annotate | diff | comparison | revisions
     1.1 --- a/glib/glib.patch	Fri Aug 03 15:16:43 2012 +0200
     1.2 +++ b/glib/glib.patch	Fri Aug 03 15:21:22 2012 +0200
     1.3 @@ -141,3 +141,34 @@
     1.4   }
     1.5   
     1.6   static void
     1.7 +diff -Nau gio/gsocket.c.orig gio/gsocket.c
     1.8 +Index: gio/gsocket.c
     1.9 +--- gio/gsocket.c.orig	2012-08-03 11:38:08.419548195 +0200
    1.10 ++++ gio/gsocket.c	2012-08-03 11:38:11.307357875 +0200
    1.11 +@@ -48,6 +48,10 @@
    1.12 + #include <sys/uio.h>
    1.13 + #endif
    1.14 + 
    1.15 ++#if defined (__SVR4) && defined (__sun)
    1.16 ++#include <sys/filio.h>
    1.17 ++#endif
    1.18 ++
    1.19 + #include "gcancellable.h"
    1.20 + #include "gioenumtypes.h"
    1.21 + #include "ginetaddress.h"
    1.22 +diff -Nau gio/gresource-tool.c.orig gio/gresource-tool.c
    1.23 +Index: gio/gresource-tool.c
    1.24 +--- gio/gresource-tool.c.orig	2012-08-03 11:25:31.632225248 +0200
    1.25 ++++ gio/gresource-tool.c	2012-08-03 11:38:12.657797557 +0200
    1.26 +@@ -31,6 +31,11 @@
    1.27 + #include <locale.h>
    1.28 + 
    1.29 + #ifdef HAVE_LIBELF
    1.30 ++/* Solaris libelf does not support largefile in 32-bit mode */
    1.31 ++#if defined (__SVR4) && defined (__sun) && defined (__i386)
    1.32 ++#undef  _FILE_OFFSET_BITS
    1.33 ++#define _FILE_OFFSET_BITS   32
    1.34 ++#endif
    1.35 + #include <libelf.h>
    1.36 + #include <gelf.h>
    1.37 + #include <sys/mman.h>
     2.1 --- a/glib/glib.spec	Fri Aug 03 15:16:43 2012 +0200
     2.2 +++ b/glib/glib.spec	Fri Aug 03 15:21:22 2012 +0200
     2.3 @@ -36,7 +36,7 @@
     2.4  Group:        Algorithm
     2.5  License:      GPL
     2.6  Version:      %{V_major}.%{V_minor}
     2.7 -Release:      20120713
     2.8 +Release:      20120800
     2.9  
    2.10  #   package options
    2.11  %option       with_threads  yes
    2.12 @@ -105,10 +105,21 @@
    2.13          -e 's;/gio-2\.0;/gio;g' \
    2.14          -e 's;-l\(g[a-z]*\)-2\.0;-l\1;g' \
    2.15          *-2.0.pc.in
    2.16 +    %{l_shtool} subst \
    2.17 +        -e 's;\(#define _XOPEN_SOURCE\) 600;\1 601;' \
    2.18 +        glib/tests/strfuncs.c
    2.19 +    case "%{l_platform -t}" in
    2.20 +        *-sunos* ) 
    2.21 +            %{l_shtool} subst \
    2.22 +                -e 's;^\(LIBELF_LIBS =\);\1 -lelf;' \
    2.23 +                gio/Makefile.in
    2.24 +            ;;
    2.25 +    esac
    2.26      libs=""
    2.27  %if "%{with_threads}" == "yes"
    2.28      case "%{l_platform -t}" in
    2.29          *-netbsd*  ) libs="-lpthread" ;;
    2.30 +        *-sunos*   ) libs="-lnsl -lsocket" ;;
    2.31      esac
    2.32  %endif
    2.33      CC="%{l_cc}" \
    2.34 @@ -138,7 +149,7 @@
    2.35          --disable-shared
    2.36  
    2.37      #   build package
    2.38 -    %{l_make} %{l_mflags}
    2.39 +    %{l_make} %{l_mflags -O}
    2.40  
    2.41  %install
    2.42      #   install package

mercurial