diff options
author | reed <reed> | 2004-06-04 05:21:14 +0000 |
---|---|---|
committer | reed <reed> | 2004-06-04 05:21:14 +0000 |
commit | 11421617a01520da7b5261be9ee0a4e7365a74b2 (patch) | |
tree | a90dcff9d8587105493e70818e219aade56d27e6 | |
parent | 35102032dd3c5dc5f12a948c93a54e47fb8cf122 (diff) | |
download | pkgsrc-11421617a01520da7b5261be9ee0a4e7365a74b2.tar.gz |
By default, assume that the native iconv on Linux systems using
GLIBC supports GNU libiconv's API. So don't depend on pkgsrc's
libiconv for it. This is normal: most other Linux distros don't
provide a libiconv package.
This was discussed on tech-pkg list over past two months. It has
helped a few users under Linux where they had some problems with
conflicts with their working iconv() support provided with libc
and the libiconv package.
This was okayed by maintainer, Rene Hexel.
This still needs some improvement. Some packages still try to
force libiconv usage even though not needed.
-rw-r--r-- | converters/libiconv/builtin.mk | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk index e9f815b66dc..6ecc476c4df 100644 --- a/converters/libiconv/builtin.mk +++ b/converters/libiconv/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2004/04/26 04:53:23 jlam Exp $ +# $NetBSD: builtin.mk,v 1.5 2004/06/04 05:21:14 reed Exp $ .if !defined(_LIBICONV_FOUND) _LIBICONV_FOUND!= \ @@ -87,6 +87,21 @@ USE_BUILTIN.iconv= no . endif . endfor . endif +# XXX +# XXX By default, assume that the native iconv on Linux systems using GLIBC +# XXX supports GNU libiconv's API. +# XXX +# XXX Determine we are using the builtin iconv regardless of whether it's +# XXX truly GNU libiconv. +# XXX +. if (${OPSYS} == "Linux") && exists(${_ICONV_H}) +USE_BUILTIN.iconv!= \ + if ${GREP} -q "This file is part of the GNU C Library" ${_ICONV_H}; then \ + ${ECHO} "yes"; \ + else \ + ${ECHO} "no"; \ + fi +. endif . endif . if defined(USE_GNU_ICONV) |