[pkgsrc/trunk]: pkgsrc/devel/glib2 Don't build this with Universal Binary sup...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d346b543e75
branches:  trunk
changeset: 544430:0d346b543e75
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Jul 14 16:45:53 2008 +0000

description:
Don't build this with Universal Binary support under Mac OS X. It breaks
(at least) the GTK+ 2.x which is a known issue, see
http://trac.macports.org/ticket/15816 for more details.

Bump package revision because of this fix.

diffstat:

 devel/glib2/Makefile |   3 ++-
 devel/glib2/hacks.mk |  29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diffs (52 lines):

diff -r 04607296b477 -r 0d346b543e75 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Mon Jul 14 16:36:09 2008 +0000
+++ b/devel/glib2/Makefile      Mon Jul 14 16:45:53 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.142 2008/07/14 03:54:32 tnn Exp $
+# $NetBSD: Makefile,v 1.143 2008/07/14 16:45:53 tron Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
 DISTNAME=              glib-2.16.4
+PKGREVISION=           1
 PKGNAME=               ${DISTNAME:S/glib/glib2/}
 CATEGORIES=            devel
 MASTER_SITES=          ftp://ftp.gtk.org/pub/glib/2.16/ \
diff -r 04607296b477 -r 0d346b543e75 devel/glib2/hacks.mk
--- a/devel/glib2/hacks.mk      Mon Jul 14 16:36:09 2008 +0000
+++ b/devel/glib2/hacks.mk      Mon Jul 14 16:45:53 2008 +0000
@@ -1,20 +1,19 @@
-# $NetBSD: hacks.mk,v 1.2 2008/04/27 11:00:46 tnn Exp $
+# $NetBSD: hacks.mk,v 1.3 2008/07/14 16:45:53 tron Exp $
 
 .if !defined(GLIB2_HACKS_MK)
-GLIB2_HACKS_MK=        defined
+GLIB2_HACKS_MK=        # defined
 
-# Build without optimization. Avoids crash in libgobject on gtk2 initialization.
-# Bug is triggered regardless of whether we're using gcc or aCC.
-.if !empty(MACHINE_PLATFORM:MHPUX-*-hppa)
-PKG_HACKS+=    hppa-codegen
-CFLAGS:=       -O0 ${CFLAGS:C/[+,-]O[0-9]?//g}
-.endif
+# "glib2" supports support for Universal Binaries. But a lot of packages
+# using it (e.g. "gtk2+") don't support it. We therefore disable it.
 
-# Work around unresolved symbol g_test_config_vars during build
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Msunpro)
-PKG_HACKS+=            sunpro-visibility
-CONFIGURE_ARGS+=       --disable-visibility
+.  include "../../mk/bsd.fast.prefs.mk"
+.  if ${OPSYS} == "Darwin"
+PKG_HACKS+=    darwin-no-universal
+.    if ${MACHINE_ARCH} == "powerpc"
+CONFIGURE_ENV+=        ac_cv_c_bigendian=yes
+.    else
+CONFIGURE_ENV+=        ac_cv_c_bigendian=no
+.    endif
+.  endif
+
 .endif
-
-.endif         # GLIB2_HACKS_MK