Received: by mail.netbsd.org (Postfix, from userid 605) id CF00D84E5D; Mon, 13 Jan 2020 17:35:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 58FF384E27 for ; Mon, 13 Jan 2020 17:35:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id MFKIgB_mcR2P for ; Mon, 13 Jan 2020 17:35:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B1C6384CEA for ; Mon, 13 Jan 2020 17:35:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A57E0FBF4; Mon, 13 Jan 2020 17:35:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1578936905188820" MIME-Version: 1.0 Date: Mon, 13 Jan 2020 17:35:05 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/converters/libiconv To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20200113173505.A57E0FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1578936905188820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Mon Jan 13 17:35:05 UTC 2020 Modified Files: pkgsrc/converters/libiconv: builtin.mk Log Message: converters/libiconv: allow to skip --with-libiconv-prefix There are several GNU configure scripts that don't support this option. These packages can be found by setting GNU_CONFIGURE_STRICT=yes in mk.conf. To allow these packages to build nevertheless, packages have to skip this option explicitly, for backwards compatibility. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/converters/libiconv/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1578936905188820 Content-Disposition: inline Content-Length: 939 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/converters/libiconv/builtin.mk diff -u pkgsrc/converters/libiconv/builtin.mk:1.24 pkgsrc/converters/libiconv/builtin.mk:1.25 --- pkgsrc/converters/libiconv/builtin.mk:1.24 Sun Nov 3 17:14:25 2019 +++ pkgsrc/converters/libiconv/builtin.mk Mon Jan 13 17:35:05 2020 @@ -1,4 +1,13 @@ -# $NetBSD: builtin.mk,v 1.24 2019/11/03 17:14:25 rillig Exp $ +# $NetBSD: builtin.mk,v 1.25 2020/01/13 17:35:05 rillig Exp $ +# +# Package-settable variables: +# +# GNU_CONFIGURE_ICONV: YesNo +# Whether to add --with-libiconv-prefix to CONFIGURE_ARGS. +# +# Default: yes +# +# Keywords: iconv BUILTIN_PKG:= iconv @@ -157,7 +166,7 @@ BUILDLINK_TRANSFORM+= rm:-liconv . endif . endif -. if defined(GNU_CONFIGURE) +. if defined(GNU_CONFIGURE) && ${GNU_CONFIGURE_ICONV:Uyes:M[yY][eE][sS]} . if !empty(USE_BUILTIN.iconv:M[nN][oO]) CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} . endif --_----------=_1578936905188820--