diff options
| author | jperkin <jperkin> | 2013-03-18 14:01:24 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2013-03-18 14:01:24 +0000 |
| commit | 7c82c6ca5f920964de3c9779bee2eef2b2b96094 (patch) | |
| tree | 2a1c695bf2f6e210ba7a8f6888c0b7eced0a2064 /devel/glib2/hacks.mk | |
| parent | 1045d4a25f06ae0bd72aa7d8244b6ff05addfb9f (diff) | |
| download | pkgsrc-7c82c6ca5f920964de3c9779bee2eef2b2b96094.tar.gz | |
Ensure the Darwin libiconv_open hack is only applied when using the
native iconv.
Diffstat (limited to 'devel/glib2/hacks.mk')
| -rw-r--r-- | devel/glib2/hacks.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/devel/glib2/hacks.mk b/devel/glib2/hacks.mk index 139ee71bac5..58be4ff7781 100644 --- a/devel/glib2/hacks.mk +++ b/devel/glib2/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.8 2012/09/07 11:43:54 adam Exp $ +# $NetBSD: hacks.mk,v 1.9 2013/03/18 14:01:24 jperkin Exp $ .if !defined(GLIB2_HACKS_MK) GLIB2_HACKS_MK= # defined @@ -13,14 +13,16 @@ CFLAGS:= -O0 ${CFLAGS:C/[+,-]O[0-9]?//g} .if ${OPSYS} == "Darwin" CHECK_BUILTIN.libiconv:= yes -. include "../../converters/libiconv/builtin.mk" +. include "../../converters/libiconv/builtin.mk" CHECK_BUILTIN.libiconv:= no +. if !empty(USE_BUILTIN.iconv:M[Yy][Ee][Ss]) 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 |