Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 5E2037A21F for ; Thu, 30 Mar 2017 12:40:32 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 13988855C1; Thu, 30 Mar 2017 12:40:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 992A88557C for ; Thu, 30 Mar 2017 12:40:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id uwVpII2ff1pJ for ; Thu, 30 Mar 2017 12:40:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2F73684CDE for ; Thu, 30 Mar 2017 12:40:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2A6C1FBE4; Thu, 30 Mar 2017 12:40:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1490877631281200" MIME-Version: 1.0 Date: Thu, 30 Mar 2017 12:40:31 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/converters/libiconv To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20170330124031.2A6C1FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1490877631281200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.66 pkgsrc/converters/libiconv/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1490877631281200 Content-Disposition: inline Content-Length: 1286 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/converters/libiconv/Makefile diff -u pkgsrc/converters/libiconv/Makefile:1.65 pkgsrc/converters/libiconv/Makefile:1.66 --- pkgsrc/converters/libiconv/Makefile:1.65 Thu Oct 9 14:06:03 2014 +++ pkgsrc/converters/libiconv/Makefile Thu Mar 30 12:40:31 2017 @@ -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 --_----------=_1490877631281200--