diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-12 01:59:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-12 01:59:37 +0000 |
| commit | 1edfa505eddb87dd79db0d2897323b39e05e4a03 (patch) | |
| tree | f36bdf155011b2521ad9dfd8a23373398462d265 /converters/libiconv/buildlink3.mk | |
| parent | 3574066d66f5570c39b086cbf1ccc1116cb66c7b (diff) | |
| download | pkgsrc-1edfa505eddb87dd79db0d2897323b39e05e4a03.tar.gz | |
Reorganize code so that any dependencies are checked as part of deciding
whether the software is built-in or not. This facilitates implementing
the forthcoming PKGSRC_NATIVE variable.
Diffstat (limited to 'converters/libiconv/buildlink3.mk')
| -rw-r--r-- | converters/libiconv/buildlink3.mk | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index e9b3cf9f117..f72f13a3d36 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/11 12:17:58 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:37 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ @@ -20,12 +20,20 @@ BUILDLINK_IS_BUILTIN.iconv= NO . if exists(${_ICONV_H}) BUILDLINK_IS_BUILTIN.iconv= YES . endif +. if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[nN][oO]) _INCOMPAT_ICONV?= # should be set from defs.${OPSYS}.mk -. for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) +. for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) BUILDLINK_IS_BUILTIN.iconv= NO -. endif -. endfor +. endif +. endfor +. endif +.endif + +.if !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.iconv= YES +.else +BUILDLINK_USE_BUILTIN.iconv= NO .endif .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ @@ -41,15 +49,6 @@ BUILDLINK_USE_BUILTIN.iconv= NO BUILDLINK_USE_BUILTIN.iconv= YES .endif -.if !defined(BUILDLINK_USE_BUILTIN.iconv) -. if !empty(BUILDLINK_IS_BUILTIN.iconv:M[nN][oO]) -BUILDLINK_USE_BUILTIN.iconv= NO -. else -BUILDLINK_USE_BUILTIN.iconv= YES -. endif -MAKEFLAGS+= BUILDLINK_USE_BUILTIN.iconv=${BUILDLINK_USE_BUILTIN.iconv} -.endif - .if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO]) . if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= iconv |