summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorminskim <minskim>2005-05-22 00:01:36 +0000
committerminskim <minskim>2005-05-22 00:01:36 +0000
commitc48ec9454bad58eb7d2e539d3e78945a0ad4d465 (patch)
tree815f877399342affe1251e1c2777989bacf16dd7 /converters
parent53f71f9fc6ef8094eeb1a2144592522c4ab62f58 (diff)
downloadpkgsrc-c48ec9454bad58eb7d2e539d3e78945a0ad4d465.tar.gz
Use the iconv library in glibc on Linux even if USE_GNU_ICONV is set.
Diffstat (limited to 'converters')
-rw-r--r--converters/libiconv/builtin.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk
index 86193a3f3f9..dbb0d54feec 100644
--- a/converters/libiconv/builtin.mk
+++ b/converters/libiconv/builtin.mk
@@ -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 @@ USE_BUILTIN.iconv!= \
. 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