Thu Sep 24 06:31:27 2009 UTC ()
The 64-Bit version of "libiconv" is not compatible with the GNU version
and therefore rejected by e.g. the "glib2" package. Use the "libiconv"
package to fix this.

Approved by Alistair Crooks.


(tron)
diff -r1.41 -r1.42 pkgsrc/mk/platform/Darwin.mk
cvs diff -r1.41 -r1.42 pkgsrc/mk/platform/Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Darwin.mk 2009/09/12 21:41:26 1.41
+++ pkgsrc/mk/platform/Darwin.mk 2009/09/24 06:31:27 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Darwin.mk,v 1.41 2009/09/12 21:41:26 tron Exp $ 1# $NetBSD: Darwin.mk,v 1.42 2009/09/24 06:31:27 tron 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)
@@ -93,26 +93,30 @@ _OPSYS_LINKER_RPATH_FLAG= -L # darwin ha @@ -93,26 +93,30 @@ _OPSYS_LINKER_RPATH_FLAG= -L # darwin ha
93_OPSYS_COMPILER_RPATH_FLAG= -L # compiler flag to pass rpaths to linker 93_OPSYS_COMPILER_RPATH_FLAG= -L # compiler flag to pass rpaths to linker
94_OPSYS_SHLIB_TYPE= dylib # shared lib type 94_OPSYS_SHLIB_TYPE= dylib # shared lib type
95_PATCH_CAN_BACKUP= yes # native patch(1) can make backups 95_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
96_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix 96_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix
97_USE_RPATH= no # don't add rpath to LDFLAGS 97_USE_RPATH= no # don't add rpath to LDFLAGS
98 98
99# flags passed to the linker to extract all symbols from static archives. 99# flags passed to the linker to extract all symbols from static archives.
100# this is GNU ld. 100# this is GNU ld.
101_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive 101_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
102_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive 102_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
103 103
104_OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk 104_OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk
105 105
 106# The x86_64 "iconv" library is incomplete, please look here for details:
 107# http://www.mail-archive.com/gtk-list@gnome.org/msg28747.html
 108_INCOMPAT_ICONV= Darwin-*-x86_64
 109
106_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip 110_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip
107_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip 111_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip
108 112
109# check for maximum command line length and set it in configure's environment, 113# check for maximum command line length and set it in configure's environment,
110# to avoid a test required by the libtool script that takes forever. 114# to avoid a test required by the libtool script that takes forever.
111_OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysctl -n kern.argmax 115_OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysctl -n kern.argmax
112 116
113# Darwin 7.7.x has poll() in libc, but no poll.h. Try to help GNU 117# Darwin 7.7.x has poll() in libc, but no poll.h. Try to help GNU
114# configure packages that break because of this by pretending that 118# configure packages that break because of this by pretending that
115# there is no poll(). 119# there is no poll().
116.if defined(GNU_CONFIGURE) 120.if defined(GNU_CONFIGURE)
117. if !exists(/usr/include/poll.h) && !exists(/usr/include/sys/poll.h) 121. if !exists(/usr/include/poll.h) && !exists(/usr/include/sys/poll.h)
118CONFIGURE_ENV+= ac_cv_func_poll=no 122CONFIGURE_ENV+= ac_cv_func_poll=no