[pkgsrc/trunk]: pkgsrc/mk The USE_BUILTIN.dl code got too complex in the prev...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/022b8bf86702
branches:  trunk
changeset: 495389:022b8bf86702
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 08 08:13:05 2005 +0000

description:
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:

 mk/dlopen.builtin.mk |  26 ++++----------------------
 1 files changed, 4 insertions(+), 22 deletions(-)

diffs (41 lines):

diff -r e57da7cf0d88 -r 022b8bf86702 mk/dlopen.builtin.mk
--- a/mk/dlopen.builtin.mk      Wed Jun 08 05:54:17 2005 +0000
+++ b/mk/dlopen.builtin.mk      Wed Jun 08 08:13:05 2005 +0000
@@ -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 @@
 ### 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