diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-08 08:13:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-08 08:13:05 +0000 |
| commit | 2499370d92471305b075491c8060f4fe0588aa7b (patch) | |
| tree | f645fdb799ec1bc0b34a6d2252d32b08e17cef97 /mk | |
| parent | 532553f6534ee4461ba6b7c1ab35af3aba0276ad (diff) | |
| download | pkgsrc-2499370d92471305b075491c8060f4fe0588aa7b.tar.gz | |
The USE_BUILTIN.dl code got too complex in the previous commit.
Simplify it so that USE_BUILTIN.dl is simply IS_BUILTIN.dl except for
Darwin's special case. This makes PREFER_PKGSRC=yes work again on
NetBSD instead of causing USE_BUILTIN.dl=no to be set, which is
impossible.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/dlopen.builtin.mk | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk index 29e6660c4c4..9b586306c61 100644 --- a/mk/dlopen.builtin.mk +++ b/mk/dlopen.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.builtin.mk,v 1.11 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: dlopen.builtin.mk,v 1.12 2005/06/08 08:13:05 jlam Exp $ BUILTIN_PKG:= dl @@ -26,28 +26,10 @@ MAKEVARS+= IS_BUILTIN.dl ### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). ### .if !defined(USE_BUILTIN.dl) -. if ${PREFER.dl} == "pkgsrc" -USE_BUILTIN.dl= no -. else -USE_BUILTIN.dl= ${IS_BUILTIN.dl} -. if defined(BUILTIN_PKG.dl) && \ - !empty(IS_BUILTIN.dl:M[yY][eE][sS]) -USE_BUILTIN.dl= yes -. for _dep_ in ${BUILDLINK_DEPENDS.dl} -. if !empty(USE_BUILTIN.dl:M[yY][eE][sS]) -USE_BUILTIN.dl!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.dl:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. if ${OPSYS} == "Darwin" +USE_BUILTIN.dl= ${IS_BUILTIN.dl} +. if ${OPSYS} == "Darwin" USE_BUILTIN.dl= no # Darwin uses devel/dlcompat -. endif -. endif # PREFER.dl +. endif .endif MAKEVARS+= USE_BUILTIN.dl |