diff options
| author | jlam <jlam@pkgsrc.org> | 2004-01-05 09:31:31 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-01-05 09:31:31 +0000 |
| commit | 9a29a3c2aef4232ff758f1bffdc67e14b9766e93 (patch) | |
| tree | 5e468c9c5f542e31226f7780d62182ff9f54b072 /converters | |
| parent | d01f4241a598dfef3820ee7e4046373b4f0bd265 (diff) | |
| download | pkgsrc-9a29a3c2aef4232ff758f1bffdc67e14b9766e93.tar.gz | |
Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> variables.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libiconv/buildlink3.mk | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index 81991203b5c..e6a874b5ec8 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/buildlink3.mk @@ -1,11 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ -.if !empty(ICONV_BUILDLINK3_MK:M+) -. include "../../mk/bsd.prefs.mk" +.include "../../mk/bsd.prefs.mk" +.if !empty(ICONV_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= iconv BUILDLINK_DEPENDS.iconv?= libiconv>=1.9.1 BUILDLINK_PKGSRCDIR.iconv?= ../../converters/libiconv .endif # ICONV_BUILDLINK3_MK @@ -19,38 +20,38 @@ BUILDLINK_IS_BUILTIN.iconv= YES . endif .endif +.if defined(USE_GNU_ICONV) +BUILDLINK_USE_BUILTIN.iconv= NO +.endif + .if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS]) -_NEED_GNU_ICONV= NO +BUILDLINK_USE_BUILTIN.iconv= YES .endif -.if !defined(_NEED_GNU_ICONV) +.if !defined(BUILDLINK_USE_BUILTIN.iconv) . if !empty(BUILDLINK_IS_BUILTIN.iconv:M[nN][oO]) -_NEED_GNU_ICONV= YES +BUILDLINK_USE_BUILTIN.iconv= NO . else -_NEED_GNU_ICONV= NO +BUILDLINK_USE_BUILTIN.iconv= YES _INCOMPAT_ICONV?= # should be set from defs.${OPSYS}.mk INCOMPAT_ICONV?= # empty . for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} . if !empty(MACHINE_PLATFORM:M${_pattern_}) -_NEED_GNU_ICONV= YES +BUILDLINK_USE_BUILTIN.iconv= NO . endif . endfor . endif -. if defined(USE_GNU_ICONV) -_NEED_GNU_ICONV= YES -. endif -MAKEFLAGS+= _NEED_GNU_ICONV=${_NEED_GNU_ICONV} +MAKEFLAGS+= BUILDLINK_USE_BUILTIN.iconv="${BUILDLINK_USE_BUILTIN.iconv}" .endif -.if ${_NEED_GNU_ICONV} == "YES" +.if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO]) . if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= iconv . endif .endif .if !empty(ICONV_BUILDLINK3_MK:M+) -. if ${_NEED_GNU_ICONV} == "YES" -BUILDLINK_PACKAGES+= iconv +. if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO]) _BLNK_LIBICONV= -liconv . else . if !defined(_BLNK_LIBICONV_FOUND) @@ -69,11 +70,10 @@ _BLNK_LIBICONV= # empty BUILDLINK_TRANSFORM+= S:-liconv: . endif BUILDLINK_LDADD.iconv?= ${_BLNK_LIBICONV} -BUILDLINK_PREFIX.iconv= /usr . endif . if defined(GNU_CONFIGURE) -. if ${_NEED_GNU_ICONV} == "YES" +. if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO]) CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} . else CONFIGURE_ARGS+= --without-libiconv-prefix |