diff options
| author | jlam <jlam@pkgsrc.org> | 2007-09-24 18:33:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-09-24 18:33:52 +0000 |
| commit | c069c32fb2ec8b716c7bb214eb7ceeed7462084e (patch) | |
| tree | 3ed406008115d62f72c7e80888776c2e4645669d /devel | |
| parent | ade92d961f69c81d2b359738a83f78ccf5190e93 (diff) | |
| download | pkgsrc-c069c32fb2ec8b716c7bb214eb7ceeed7462084e.tar.gz | |
In gettext-lib/buildlink3.mk, check whether we need to pull in the
libiconv/buildlink3.mk file based on whether or not we're using the
built-in gettext-lib or not. This is clearer than what existed in
revision 1.33 of gettext-lib/builtin.mk and fixes the problem introduced
in revision 1.34.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gettext-lib/buildlink3.mk | 13 | ||||
| -rw-r--r-- | devel/gettext-lib/builtin.mk | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index d75ac314809..56414ac349d 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2007/09/24 18:33:52 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+ @@ -16,7 +16,14 @@ BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5 BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib .endif # GETTEXT_BUILDLINK3_MK -# Let the gettext-lib/builtin.mk pull in libiconv if it's needed. -#.include "../../converters/libiconv/buildlink3.mk" +.include "../../mk/bsd.prefs.mk" + +CHECK_BUILTIN.gettext:= yes +.include "../../devel/gettext-lib/builtin.mk" +CHECK_BUILTIN.gettext:= no + +.if !empty(USE_BUILTIN.gettext:M[nN][oO]) +. include "../../converters/libiconv/buildlink3.mk" +.endif BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk index 2f5f0c0d66c..637484921dc 100644 --- a/devel/gettext-lib/builtin.mk +++ b/devel/gettext-lib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.35 2007/09/18 14:14:31 joerg Exp $ +# $NetBSD: builtin.mk,v 1.36 2007/09/24 18:33:52 jlam Exp $ BUILTIN_PKG:= gettext @@ -126,7 +126,6 @@ BUILDLINK_TRANSFORM+= rm:-lintl . if !empty(USE_BUILTIN.gettext:M[nN][oO]) _BLTN_LIBINTL= -lintl _BLTN_LIBINTL+= ${BUILDLINK_LDADD.iconv} -. include "../../converters/libiconv/buildlink3.mk" . endif BUILDLINK_LDADD.gettext?= ${_BLTN_LIBINTL} |