summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--converters/libiconv/Makefile14
1 files changed, 12 insertions, 2 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 471675707cd..db0d13db167 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2014/10/09 14:06:03 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2017/03/30 12:40:31 jperkin Exp $
DISTNAME= libiconv-1.14
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
@@ -25,6 +25,16 @@ CONFIGURE_ARGS+= --disable-nls
CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/libiconv
+# Explicitly override iconv checks, as GNU libiconv will change its own
+# signature based on whether it finds itself already installed somewhere
+# which then breaks software (e.g. QT) which assumes the native signature.
+#
+# Restricted to SunOS for now, but likely will be useful everywhere.
+#
+CONFIGURE_ENV.SunOS+= am_cv_func_iconv=yes
+CONFIGURE_ENV.SunOS+= am_cv_proto_iconv_arg1='const'
+CONFIGURE_ENV.SunOS+= am_cv_proto_iconv='extern size_t iconv (iconv_t cd, const char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);'
+
TEST_TARGET= check
EGDIR= ${PREFIX}/share/examples/libiconv