CVS commit: pkgsrc

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

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.