diff options
| author | jlam <jlam> | 2000-08-24 23:29:26 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2000-08-24 23:29:26 +0000 |
| commit | bdafd1b8d98a56c4b0be05770f1b825185645205 (patch) | |
| tree | 5c35099500e2e17b0adb2c11d97e039d5cacceca /mk | |
| parent | b2153bc9ff7203816c3a58449a89ad8aedefe9f8 (diff) | |
| download | pkgsrc-bdafd1b8d98a56c4b0be05770f1b825185645205.tar.gz | |
In check-shlibs, use ${LDD}, instead of directly invoking "ldd" to check
whether the proper shared libs are available. Packages which use the
emulation system should set LDD to the path of a the emulated ldd, or
simply set it to true, e.g.:
LDD?= /emul/linux/usr/bin/ldd
LDD?= ${TRUE}
Fixes PR#10853.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 17a803dc083..2ee42285bfc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.549 2000/08/23 22:22:53 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.550 2000/08/24 23:29:26 jlam Exp $ # # This file is in the public domain. # @@ -1745,16 +1745,21 @@ root-install: # check-shlibs: ${_PKG_SILENT}${_PKG_DEBUG}\ - bins=`${PKG_INFO} -qL ${PKGNAME} | ( ${EGREP} -h '/(bin|sbin|libexec)/' || true )`; \ + bins=`${PKG_INFO} -qL ${PKGNAME} | ( ${EGREP} -h '/(bin|sbin|libexec)/' || ${TRUE} )`; \ if [ "${OBJECT_FMT}" = "ELF" ]; then \ - shlibs=`${PKG_INFO} -qL ${PKGNAME} | ( ${EGREP} -h '/lib/lib.*.so' || true )`; \ + shlibs=`${PKG_INFO} -qL ${PKGNAME} | ( ${EGREP} -h '/lib/lib.*.so' || ${TRUE} )`; \ else \ shlibs=""; \ fi ; \ + if [ X${LDD} = X ]; then \ + ldd=`${TYPE} ldd | ${AWK} '{ print $$NF }'` ; \ + else \ + ldd="${LDD}" ; \ + fi ; \ for i in $${bins} $${shlibs} ; do \ - err=`( ldd $$i 2>&1 || true ) | ( grep "not found" || true )`; \ + err=`( $$ldd $$i 2>&1 || ${TRUE} ) | ( ${GREP} "not found" || ${TRUE} )`; \ if [ "${PKG_VERBOSE}" != "" ]; then \ - echo "ldd $$i" ; \ + echo "$$ldd $$i" ; \ fi ; \ if [ "$$err" != "" ]; then \ echo "$$i: $$err" ; \ |