diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-03-18 14:01:24 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-03-18 14:01:24 +0000 |
| commit | b253802fef16cfa06d2bfa23257b7d46b362fbf1 (patch) | |
| tree | 2a1c695bf2f6e210ba7a8f6888c0b7eced0a2064 /devel | |
| parent | 87dff69ed9723a1e6042f30c44408b5cabc24df0 (diff) | |
| download | pkgsrc-b253802fef16cfa06d2bfa23257b7d46b362fbf1.tar.gz | |
Ensure the Darwin libiconv_open hack is only applied when using the
native iconv.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gdbus-codegen/hacks.mk | 6 | ||||
| -rw-r--r-- | devel/glib2/hacks.mk | 6 | ||||
| -rw-r--r-- | devel/pkg-config/hacks.mk | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/devel/gdbus-codegen/hacks.mk b/devel/gdbus-codegen/hacks.mk index a35002fcc9e..63792e6ab2d 100644 --- a/devel/gdbus-codegen/hacks.mk +++ b/devel/gdbus-codegen/hacks.mk @@ -1,18 +1,20 @@ -# $NetBSD: hacks.mk,v 1.1 2012/11/13 21:23:07 adam Exp $ +# $NetBSD: hacks.mk,v 1.2 2013/03/18 14:01:24 jperkin Exp $ .if !defined(GDBUS_CODEGEN_HACKS_MK) GDBUS_CODEGEN_HACKS_MK= # defined .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 .endif 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 diff --git a/devel/pkg-config/hacks.mk b/devel/pkg-config/hacks.mk index b0669ce2666..4ee7f53a9a7 100644 --- a/devel/pkg-config/hacks.mk +++ b/devel/pkg-config/hacks.mk @@ -1,15 +1,20 @@ -# $NetBSD: hacks.mk,v 1.1 2012/08/23 13:34:44 adam Exp $ +# $NetBSD: hacks.mk,v 1.2 2013/03/18 14:01:24 jperkin Exp $ .if !defined(PKGCONFIG_HACKS_MK) PKGCONFIG_HACKS_MK= # defined .if ${OPSYS} == "Darwin" +CHECK_BUILTIN.libiconv:= yes +. 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= glib/configure SUBST_SED.iconv= -e 's,libiconv_open,iconv_open,g' +. endif .endif .endif |