diff options
| author | agc <agc> | 2004-01-09 22:26:27 +0000 |
|---|---|---|
| committer | agc <agc> | 2004-01-09 22:26:27 +0000 |
| commit | f3e669ebe0a70710a748b1d68eb4d509c2038cd6 (patch) | |
| tree | 11f441da724918e4df7ac604f1e9830fa2529f92 | |
| parent | 73030f5e24d02538a9dbecbe5cf2472c56bfe890 (diff) | |
| download | pkgsrc-f3e669ebe0a70710a748b1d68eb4d509c2038cd6.tar.gz | |
Pull up, via patch, a portability fix, to the pkgsrc-2003Q4 branch. Requested
by Grant Beattie.
Module Name: pkgsrc
Committed By: grant
Date: Mon Jan 5 07:15:39 UTC 2004
Modified Files:
pkgsrc/mk: bsd.pkg.mk
Log Message:
fix a bug in the extraction of shlib dependencies on Darwin which
caused non-shared objects to be mistakenly added to the buildinfo
REQUIRES.
| -rw-r--r-- | mk/bsd.pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8612a8fbd77..e67b11ab749 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1305.2.1 2003/12/12 11:35:20 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1305.2.2 2004/01/09 22:26:27 agc Exp $ # # This file is in the public domain. # @@ -4597,7 +4597,7 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} Mach-O) bins=`${SETENV} PREFIX=${PREFIX} ${AWK} '/^(bin|sbin|libexec)\// { print ENVIRON["PREFIX"] "/" $$0 }' ${PLIST} || ${TRUE}`; \ libs=`${SETENV} PREFIX=${PREFIX} ${AWK} '/^lib\/lib.*\.dylib/ { print ENVIRON["PREFIX"] "/" $$0 }' ${PLIST} || ${TRUE}`; \ if ${TEST} "$$bins" != "" -o "$$libs" != ""; then \ - requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} 'NF > 1 { print $$1 }' | ${SORT} -u`; \ + requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '/compatibility version/ { print $$1 }' | ${SORT} -u`; \ fi; \ ;; \ esac; \ |