From b1d3b99d8f9ed69cc371f39d9e4971b93ba0b652 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Wed, 25 Jul 2012 13:17:08 +0000
Subject: darwin-iconv hack is only required for the case using native
 libiconv. PR 46720.

---
 devel/glib2/hacks.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'devel/glib2/hacks.mk')

diff --git a/devel/glib2/hacks.mk b/devel/glib2/hacks.mk
index 8c972434bb4..7f3adad8774 100644
--- a/devel/glib2/hacks.mk
+++ b/devel/glib2/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.6 2012/05/01 18:45:52 adam Exp $
+# $NetBSD: hacks.mk,v 1.7 2012/07/25 13:17:08 obache Exp $
 
 .if !defined(GLIB2_HACKS_MK)
 GLIB2_HACKS_MK=	# defined
@@ -12,12 +12,17 @@ CFLAGS:=	-O0 ${CFLAGS:C/[+,-]O[0-9]?//g}
 .endif
 
 .if ${OPSYS} == "Darwin"
+CHECK_BUILTIN.libiconv:=	yes
+. include "../../converters/libiconv/builtin.mk"
+CHECK_BUILTIN.libiconv:=	no
+. if ${ICONV_TYPE} == "native"
 PKG_HACKS+=		darwin-iconv
 SUBST_CLASSES+=		iconv
 SUBST_STAGE.iconv=	pre-configure
 SUBST_MESSAGE.iconv=	Changing libiconv_open to iconv_open.
 SUBST_FILES.iconv=	configure
 SUBST_SED.iconv=	-e 's,libiconv_open,iconv_open,g'
+. endif
 .endif
 
 # Work around unresolved symbol g_test_config_vars during build
-- 
cgit v1.2.3