diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-11 11:30:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-11 11:30:49 +0000 |
| commit | 7c68eb548f89a9227972cfc3d5801f9d5d62110a (patch) | |
| tree | 52b113c0ef376141f7b0fef403939f60d89cf6ca /converters/libiconv | |
| parent | 6dbc10b506e6cf94f57aa1cfe0910c783cc2ef5b (diff) | |
| download | pkgsrc-7c68eb548f89a9227972cfc3d5801f9d5d62110a.tar.gz | |
Move the INCOMPAT_FOO checks to a more natural location within the
block that decides whether package FOO is built-in or not. If the
platform is listed in IMCOMPAT_FOO, then treat FOO as being not
built-in.
Diffstat (limited to 'converters/libiconv')
| -rw-r--r-- | converters/libiconv/buildlink3.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index 5af6e87eac3..4e811f7daff 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/11 11:30:49 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ @@ -18,6 +18,12 @@ BUILDLINK_IS_BUILTIN.iconv= NO . if exists(/usr/include/iconv.h) BUILDLINK_IS_BUILTIN.iconv= YES . endif +_INCOMPAT_ICONV?= # should be set from defs.${OPSYS}.mk +. for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +BUILDLINK_IS_BUILTIN.iconv= NO +. endif +. endfor .endif .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ @@ -38,13 +44,6 @@ BUILDLINK_USE_BUILTIN.iconv= YES BUILDLINK_USE_BUILTIN.iconv= NO . else 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_}) -BUILDLINK_USE_BUILTIN.iconv= NO -. endif -. endfor . endif MAKEFLAGS+= BUILDLINK_USE_BUILTIN.iconv=${BUILDLINK_USE_BUILTIN.iconv} .endif |