diff options
| author | tron <tron@pkgsrc.org> | 2008-07-14 16:45:53 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-07-14 16:45:53 +0000 |
| commit | 07116c7a1200cf5edadc756f9ef78edc626b9952 (patch) | |
| tree | eca0126397c7343cc0af9a3714c9f9f4883472c0 /devel/glib2 | |
| parent | 9540b3f29ea3be9754c26f675fac01f13965eb1f (diff) | |
| download | pkgsrc-07116c7a1200cf5edadc756f9ef78edc626b9952.tar.gz | |
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 (limited to 'devel/glib2')
| -rw-r--r-- | devel/glib2/Makefile | 3 | ||||
| -rw-r--r-- | devel/glib2/hacks.mk | 29 |
2 files changed, 16 insertions, 16 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 038ea3a1faa..da845ef95a6 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -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 --git a/devel/glib2/hacks.mk b/devel/glib2/hacks.mk index 7d24b59d9b8..6589d54d78d 100644 --- a/devel/glib2/hacks.mk +++ b/devel/glib2/hacks.mk @@ -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 -.endif +. 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 # GLIB2_HACKS_MK +.endif |