CVS commit: [pkgsrc-2017Q1] pkgsrc/converters/libiconv

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Apr  1 14:59:21 UTC 2017

Modified Files:
        pkgsrc/converters/libiconv [pkgsrc-2017Q1]: Makefile

Log Message:
Pullup ticket #5226 - requested by sevan
converters/libiconv: build fix

Revisions pulled up:
- converters/libiconv/Makefile                                  1.66

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Thu Mar 30 12:40:31 UTC 2017

   Modified Files:
           pkgsrc/converters/libiconv: Makefile

   Log Message:
   Explicitly override iconv checks on SunOS, 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 its native signature.

   Restricted to SunOS for now as that's where it has been tested with positive
   results, but likely will be useful everywhere.

   Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.65.20.1 pkgsrc/converters/libiconv/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/libiconv/Makefile
diff -u pkgsrc/converters/libiconv/Makefile:1.65 pkgsrc/converters/libiconv/Makefile:1.65.20.1
--- pkgsrc/converters/libiconv/Makefile:1.65    Thu Oct  9 14:06:03 2014
+++ pkgsrc/converters/libiconv/Makefile Sat Apr  1 14:59:21 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2014/10/09 14:06:03 wiz Exp $
+# $NetBSD: Makefile,v 1.65.20.1 2017/04/01 14:59:21 bsiegert 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