summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2011-01-04 09:55:15 +0000
committeradam <adam@pkgsrc.org>2011-01-04 09:55:15 +0000
commit2c231eda727a5363554a74d2d9a15906f6a9dcb5 (patch)
tree1015936a862d8f64ebc9fb022ecb7c2ca4f4ff18 /devel
parent21db76a539ab5678ea7f40b20fe171cdc6f91cc0 (diff)
downloadpkgsrc-2c231eda727a5363554a74d2d9a15906f6a9dcb5.tar.gz
Darwin hacks changes:
* forget about problem with universal binaries; it's fixed with ABI * replace libiconv_open with iconv_open in configure, so system libiconv can be detected and used in 64-bit mode
Diffstat (limited to 'devel')
-rw-r--r--devel/glib2/hacks.mk17
1 files changed, 7 insertions, 10 deletions
diff --git a/devel/glib2/hacks.mk b/devel/glib2/hacks.mk
index 56b6522d3b4..c7b5b4d93b7 100644
--- a/devel/glib2/hacks.mk
+++ b/devel/glib2/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2008/09/05 15:33:01 tron Exp $
+# $NetBSD: hacks.mk,v 1.5 2011/01/04 09:55:15 adam Exp $
.if !defined(GLIB2_HACKS_MK)
GLIB2_HACKS_MK= # defined
@@ -11,16 +11,13 @@ 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.
-
. 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
+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
# Work around unresolved symbol g_test_config_vars during build