Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11]) by narn.NetBSD.org (Postfix) with ESMTP id 9853A63B90D for ; Wed, 27 Feb 2008 22:10:35 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 0) id 4E26463B197; Wed, 27 Feb 2008 22:10:35 +0000 (UTC) Received: from cvs.netbsd.org (unknown [IPv6:2001:4f8:4:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 524C663B16F for ; Wed, 27 Feb 2008 22:10:34 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 246D6175C1; Wed, 27 Feb 2008 22:10:34 +0000 (UTC) From: "Johnny C. Lam" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: jlam@netbsd.org Message-Id: <20080227221034.246D6175C1@cvs.netbsd.org> Date: Wed, 27 Feb 2008 22:10:34 +0000 (UTC) Sender: pkgsrc-changes-owner@NetBSD.org Precedence: list Module Name: pkgsrc Committed By: jlam Date: Wed Feb 27 22:10:34 UTC 2008 Modified Files: pkgsrc/converters/libiconv: buildlink3.mk builtin.mk pkgsrc/devel/gettext-lib: buildlink3.mk builtin.mk Log Message: Greatly simplify the logic that tries to determine whether -lintl needs -liconv in order to satisfy linkage requirements. This is now patterned after the approach taken with readline and termlib. Examples on NetBSD for a package that includes only gettext-lib/buildlink3.mk: PREFER_NATIVE= yes PREFER_PKGSRC= # empty # This uses the native gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= yes PREFER_PKGSRC= iconv # This uses the native gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= yes PREFER_PKGSRC= gettext # This uses the pkgsrc gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= yes PREFER_PKGSRC= gettext iconv # This uses the pkgsrc gettext and pkgsrc iconv, with: # BUILDLINK_LDADD.gettext == "-lintl -liconv" PREFER_NATIVE= # empty PREFER_PKGSRC= yes # This uses the pkgsrc gettext and pkgsrc iconv, with: # BUILDLINK_LDADD.gettext == "-lintl -liconv" PREFER_NATIVE= iconv PREFER_PKGSRC= yes # This uses the pkgsrc gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= gettext PREFER_PKGSRC= yes # This uses the native gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= gettext iconv PREFER_PKGSRC= yes # This uses the native gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" To generate a diff of this commit: cvs rdiff -r1.24 -r1.25 pkgsrc/converters/libiconv/buildlink3.mk cvs rdiff -r1.18 -r1.19 pkgsrc/converters/libiconv/builtin.mk cvs rdiff -r1.29 -r1.30 pkgsrc/devel/gettext-lib/buildlink3.mk cvs rdiff -r1.37 -r1.38 pkgsrc/devel/gettext-lib/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.