diff options
| author | adam <adam> | 2011-01-04 09:53:31 +0000 |
|---|---|---|
| committer | adam <adam> | 2011-01-04 09:53:31 +0000 |
| commit | 2cde1f73e5270899949adbbbbea14aef51d8bf85 (patch) | |
| tree | e123c7752b74bcaea19167cc14e489830cb77631 /mk/platform/Darwin.mk | |
| parent | 7c9d9d8c54821eacb5a84b5e68f5122126f03069 (diff) | |
| download | pkgsrc-2cde1f73e5270899949adbbbbea14aef51d8bf85.tar.gz | |
Removed _INCOMPAT_ICONV.
The problem is Darwin's libiconv does not have symbols for libiconv_<name>
(e.g. libiconv_open), but iconv_<name> (e.g. iconv_open).
BUT when there's pkgsrc/converters/libiconv installed instead, it doesn't
have symbols for iconv_<name>, but libiconv_<name>.
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.
Diffstat (limited to 'mk/platform/Darwin.mk')
| -rw-r--r-- | mk/platform/Darwin.mk | 6 |
1 files changed, 1 insertions, 5 deletions
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 |