pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/dlcompat dlcompat is considered built-in only if...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/09b810bccc00
branches:  trunk
changeset: 485190:09b810bccc00
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Dec 05 06:59:21 2004 +0000

description:
dlcompat is considered built-in only if both /usr/lib/libdl.* and
/usr/include/dlfcn.h exist.  Also, correct the setting of
USE_BUILTIN.dlcompat in the loop.

diffstat:

 devel/dlcompat/builtin.mk |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r d83949631cf7 -r 09b810bccc00 devel/dlcompat/builtin.mk
--- a/devel/dlcompat/builtin.mk Sun Dec 05 05:57:02 2004 +0000
+++ b/devel/dlcompat/builtin.mk Sun Dec 05 06:59:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2004/11/28 05:44:34 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2004/12/05 06:59:21 jlam Exp $
 
 .for _lib_ in dl
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -19,9 +19,7 @@
 
 .if !defined(IS_BUILTIN.dlcompat)
 IS_BUILTIN.dlcompat=   no
-.  if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS])
-IS_BUILTIN.dlcompat=   yes
-.  elif exists(${_DL_H})
+.  if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS]) && exists(${_DL_H})
 IS_BUILTIN.dlcompat=   yes
 .    if !empty(IS_BUILTIN.dlcompat:M[yY][eE][sS])
 _DL_VERSION=           20030629
@@ -39,7 +37,7 @@
 .  if defined(BUILTIN_PKG.dlcompat)
 USE_BUILTIN.dlcompat=  yes
 .    for _depend_ in ${BUILDLINK_DEPENDS.dlcompat}
-.      if !empty(IS_BUILTIN.dlcompat:M[yY][eE][sS])
+.      if !empty(USE_BUILTIN.dlcompat:M[yY][eE][sS])
 USE_BUILTIN.dlcompat!=                                                 \
        if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.dlcompat}; then \
                ${ECHO} "yes";                                          \



Home | Main Index | Thread Index | Old Index