diff options
author | jperkin <jperkin@pkgsrc.org> | 2017-03-30 12:40:31 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2017-03-30 12:40:31 +0000 |
commit | 24090944c5195d0a4f9320a66033411e566f35fd (patch) | |
tree | 9ab537bd6ea3f89318ea2911eae28563ecaee055 | |
parent | 0a185e0752b8589e5e2ba75f6cc9cfa963133d77 (diff) | |
download | pkgsrc-24090944c5195d0a4f9320a66033411e566f35fd.tar.gz |
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.
-rw-r--r-- | converters/libiconv/Makefile | 14 |
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 |