pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/converters/libiconv Use the iconv library in glibc on ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2812a2ab3196
branches:  trunk
changeset: 494252:2812a2ab3196
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun May 22 00:01:36 2005 +0000

description:
Use the iconv library in glibc on Linux even if USE_GNU_ICONV is set.

diffstat:

 converters/libiconv/builtin.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r df1c14ad1f8a -r 2812a2ab3196 converters/libiconv/builtin.mk
--- a/converters/libiconv/builtin.mk    Sat May 21 23:21:39 2005 +0000
+++ b/converters/libiconv/builtin.mk    Sun May 22 00:01:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2004/08/28 06:05:31 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/05/22 00:01:36 minskim Exp $
 
 .if !defined(_LIBICONV_FOUND)
 _LIBICONV_FOUND!=                                                      \
@@ -104,7 +104,8 @@
 .    endif
 .  endif
 
-.  if defined(USE_GNU_ICONV)
+.  if defined(USE_GNU_ICONV) && \
+       (${OPSYS} != "Linux" || !empty(USE_BUILTIN.iconv:M[nN][oO]))
 .    if !empty(IS_BUILTIN.iconv:M[nN][oO]) || \
         (${PREFER.iconv} == "pkgsrc")
 USE_BUILTIN.iconv=     no



Home | Main Index | Thread Index | Old Index