summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2000-08-24 23:29:26 +0000
committerjlam <jlam@pkgsrc.org>2000-08-24 23:29:26 +0000
commitb01048b9aae6cc963a55e1b6762ab0e1e32930fd (patch)
tree5c35099500e2e17b0adb2c11d97e039d5cacceca
parent2df2b98891a1931cf6656b544a950d83e22aaa89 (diff)
downloadpkgsrc-b01048b9aae6cc963a55e1b6762ab0e1e32930fd.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.
-rw-r--r--mk/bsd.pkg.mk15
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" ; \