Wed Jul 25 13:17:08 2012 UTC ()
darwin-iconv hack is only required for the case using native libiconv.
PR 46720.


(obache)
diff -r1.6 -r1.7 pkgsrc/devel/glib2/hacks.mk
cvs diff -r1.6 -r1.7 pkgsrc/devel/glib2/Attic/hacks.mk (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Attic/hacks.mk 2012/05/01 18:45:52 1.6
+++ pkgsrc/devel/glib2/Attic/hacks.mk 2012/07/25 13:17:08 1.7
@@ -1,30 +1,35 @@ @@ -1,30 +1,35 @@
1# $NetBSD: hacks.mk,v 1.6 2012/05/01 18:45:52 adam Exp $ 1# $NetBSD: hacks.mk,v 1.7 2012/07/25 13:17:08 obache Exp $
2 2
3.if !defined(GLIB2_HACKS_MK) 3.if !defined(GLIB2_HACKS_MK)
4GLIB2_HACKS_MK= # defined 4GLIB2_HACKS_MK= # defined
5 5
6# Build without optimization. Avoids crash in libgobject on gtk2 6# Build without optimization. Avoids crash in libgobject on gtk2
7# initialization. Bug is triggered regardless of whether we're using gcc or 7# initialization. Bug is triggered regardless of whether we're using gcc or
8# aCC. 8# aCC.
9.if !empty(MACHINE_PLATFORM:MHPUX-*-hppa) 9.if !empty(MACHINE_PLATFORM:MHPUX-*-hppa)
10PKG_HACKS+= hppa-codegen 10PKG_HACKS+= hppa-codegen
11CFLAGS:= -O0 ${CFLAGS:C/[+,-]O[0-9]?//g} 11CFLAGS:= -O0 ${CFLAGS:C/[+,-]O[0-9]?//g}
12.endif 12.endif
13 13
14.if ${OPSYS} == "Darwin" 14.if ${OPSYS} == "Darwin"
 15CHECK_BUILTIN.libiconv:= yes
 16. include "../../converters/libiconv/builtin.mk"
 17CHECK_BUILTIN.libiconv:= no
 18. if ${ICONV_TYPE} == "native"
15PKG_HACKS+= darwin-iconv 19PKG_HACKS+= darwin-iconv
16SUBST_CLASSES+= iconv 20SUBST_CLASSES+= iconv
17SUBST_STAGE.iconv= pre-configure 21SUBST_STAGE.iconv= pre-configure
18SUBST_MESSAGE.iconv= Changing libiconv_open to iconv_open. 22SUBST_MESSAGE.iconv= Changing libiconv_open to iconv_open.
19SUBST_FILES.iconv= configure 23SUBST_FILES.iconv= configure
20SUBST_SED.iconv= -e 's,libiconv_open,iconv_open,g' 24SUBST_SED.iconv= -e 's,libiconv_open,iconv_open,g'
 25. endif
21.endif 26.endif
22 27
23# Work around unresolved symbol g_test_config_vars during build 28# Work around unresolved symbol g_test_config_vars during build
24.include "../../mk/compiler.mk" 29.include "../../mk/compiler.mk"
25.if !empty(PKGSRC_COMPILER:Msunpro) 30.if !empty(PKGSRC_COMPILER:Msunpro)
26PKG_HACKS+= sunpro-visibility 31PKG_HACKS+= sunpro-visibility
27CONFIGURE_ARGS+= --disable-visibility 32CONFIGURE_ARGS+= --disable-visibility
28.endif 33.endif
29 34
30.endif 35.endif