[pkgsrc/trunk]: pkgsrc/devel/glib2 Re-add hacks that I accidently removed whe...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/537c9f2fee16
branches:  trunk
changeset: 546590:537c9f2fee16
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Sep 05 15:33:01 2008 +0000

description:
Re-add hacks that I accidently removed when adding the work around for
the Darwin Universal build problem. Problem noted by Tobias Nygren.

diffstat:

 devel/glib2/hacks.mk |  18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 3f00efd317e3 -r 537c9f2fee16 devel/glib2/hacks.mk
--- a/devel/glib2/hacks.mk      Fri Sep 05 15:18:28 2008 +0000
+++ b/devel/glib2/hacks.mk      Fri Sep 05 15:33:01 2008 +0000
@@ -1,12 +1,19 @@
-# $NetBSD: hacks.mk,v 1.3 2008/07/14 16:45:53 tron Exp $
+# $NetBSD: hacks.mk,v 1.4 2008/09/05 15:33:01 tron Exp $
 
 .if !defined(GLIB2_HACKS_MK)
 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.
 
-.  include "../../mk/bsd.fast.prefs.mk"
 .  if ${OPSYS} == "Darwin"
 PKG_HACKS+=    darwin-no-universal
 .    if ${MACHINE_ARCH} == "powerpc"
@@ -16,4 +23,11 @@
 .    endif
 .  endif
 
+# 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
+.  endif
+
 .endif