diff options
| author | jlam <jlam> | 2004-12-05 06:59:21 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-12-05 06:59:21 +0000 |
| commit | 8fa1ddd3abb5247748691ced45da4a1f8b980f72 (patch) | |
| tree | bc814aa73893927a401b0d32a9f9a18e890848fa /devel/dlcompat | |
| parent | 3009ab4c1db3802d9ae755f1dd2e0788cec0ae19 (diff) | |
| download | pkgsrc-8fa1ddd3abb5247748691ced45da4a1f8b980f72.tar.gz | |
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 (limited to 'devel/dlcompat')
| -rw-r--r-- | devel/dlcompat/builtin.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/devel/dlcompat/builtin.mk b/devel/dlcompat/builtin.mk index 71560bd61e1..b9a6c371301 100644 --- a/devel/dlcompat/builtin.mk +++ b/devel/dlcompat/builtin.mk @@ -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 @@ _DL_H= /usr/include/dlfcn.h .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 @@ PREFER.dlcompat?= pkgsrc . 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"; \ |