From 21db76a539ab5678ea7f40b20fe171cdc6f91cc0 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 4 Jan 2011 09:53:31 +0000 Subject: Removed _INCOMPAT_ICONV. The problem is Darwin's libiconv does not have symbols for libiconv_ (e.g. libiconv_open), but iconv_ (e.g. iconv_open). BUT when there's pkgsrc/converters/libiconv installed instead, it doesn't have symbols for iconv_, but libiconv_. Some packages auto-configure looks for libiconv_open (like glib2), others look for iconv_open (like proftpd), and there's a conflict. The solution is to replace libiconv_open with iconv_open with SUBST framework. --- mk/platform/Darwin.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index a2fc62eda62..c1daf456f9b 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.44 2010/12/22 20:43:45 abs Exp $ +# $NetBSD: Darwin.mk,v 1.45 2011/01/04 09:53:31 adam Exp $ # # Variable definitions for the Darwin operating system. @@ -108,10 +108,6 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive _OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk -# The x86_64 "iconv" library is incomplete, please look here for details: -# http://www.mail-archive.com/gtk-list@gnome.org/msg28747.html -_INCOMPAT_ICONV= Darwin-*-x86_64 - _STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip _STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip -- cgit v1.2.3