Tue Jan 4 09:53:31 2011 UTC ()
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.


(adam)
diff -r1.44 -r1.45 pkgsrc/mk/platform/Darwin.mk
cvs diff -r1.44 -r1.45 pkgsrc/mk/platform/Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Darwin.mk 2010/12/22 20:43:45 1.44
+++ pkgsrc/mk/platform/Darwin.mk 2011/01/04 09:53:31 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Darwin.mk,v 1.44 2010/12/22 20:43:45 abs Exp $ 1# $NetBSD: Darwin.mk,v 1.45 2011/01/04 09:53:31 adam Exp $
2# 2#
3# Variable definitions for the Darwin operating system. 3# Variable definitions for the Darwin operating system.
4 4
5# OS, Kernel, Xcode Version 5# OS, Kernel, Xcode Version
6# 6#
7# Codename OS Kernel Xcode 7# Codename OS Kernel Xcode
8# Cheetah 10.0.x 1.3.1 8# Cheetah 10.0.x 1.3.1
9# Puma 10.1 1.4.1 9# Puma 10.1 1.4.1
10# 10.1.x 5.x.y 10# 10.1.x 5.x.y
11# Jaguar 10.2.x 6.x.y 11# Jaguar 10.2.x 6.x.y
12# Panther 10.3.x 7.x.y 12# Panther 10.3.x 7.x.y
13# Tiger 10.4.x 8.x.y 2.x (gcc 4.0, 4.0.1 from 2.2) 13# Tiger 10.4.x 8.x.y 2.x (gcc 4.0, 4.0.1 from 2.2)
14# Leopard 10.5.x 9.x.y 3.x (gcc 4.0.1, 4.0.1 and 4.2.1 from 3.1) 14# Leopard 10.5.x 9.x.y 3.x (gcc 4.0.1, 4.0.1 and 4.2.1 from 3.1)
@@ -98,30 +98,26 @@ _OPSYS_LINKER_RPATH_FLAG= -L # darwin ha @@ -98,30 +98,26 @@ _OPSYS_LINKER_RPATH_FLAG= -L # darwin ha
98_OPSYS_COMPILER_RPATH_FLAG= -L # compiler flag to pass rpaths to linker 98_OPSYS_COMPILER_RPATH_FLAG= -L # compiler flag to pass rpaths to linker
99_OPSYS_SHLIB_TYPE= dylib # shared lib type 99_OPSYS_SHLIB_TYPE= dylib # shared lib type
100_PATCH_CAN_BACKUP= yes # native patch(1) can make backups 100_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
101_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix 101_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix
102_USE_RPATH= no # don't add rpath to LDFLAGS 102_USE_RPATH= no # don't add rpath to LDFLAGS
103 103
104# flags passed to the linker to extract all symbols from static archives. 104# flags passed to the linker to extract all symbols from static archives.
105# this is GNU ld. 105# this is GNU ld.
106_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive 106_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
107_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive 107_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
108 108
109_OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk 109_OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk
110 110
111# The x86_64 "iconv" library is incomplete, please look here for details: 
112# http://www.mail-archive.com/gtk-list@gnome.org/msg28747.html 
113_INCOMPAT_ICONV= Darwin-*-x86_64 
114 
115_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip 111_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip
116_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip 112_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip
117 113
118# check for maximum command line length and set it in configure's environment, 114# check for maximum command line length and set it in configure's environment,
119# to avoid a test required by the libtool script that takes forever. 115# to avoid a test required by the libtool script that takes forever.
120_OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysctl -n kern.argmax 116_OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysctl -n kern.argmax
121 117
122# Darwin 7.7.x has poll() in libc, but no poll.h. Try to help GNU 118# Darwin 7.7.x has poll() in libc, but no poll.h. Try to help GNU
123# configure packages that break because of this by pretending that 119# configure packages that break because of this by pretending that
124# there is no poll(). 120# there is no poll().
125.if defined(GNU_CONFIGURE) 121.if defined(GNU_CONFIGURE)
126. if !exists(/usr/include/poll.h) && !exists(/usr/include/sys/poll.h) 122. if !exists(/usr/include/poll.h) && !exists(/usr/include/sys/poll.h)
127CONFIGURE_ENV+= ac_cv_func_poll=no 123CONFIGURE_ENV+= ac_cv_func_poll=no