diff options
| author | tv <tv@pkgsrc.org> | 2004-10-28 14:05:56 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-10-28 14:05:56 +0000 |
| commit | 2c8efb738f3f55a5326592a0dc7e7d5f6dc24c39 (patch) | |
| tree | c14d429d32ea649e8dec1a9db7589eae2e63e387 /mk | |
| parent | b22244a01f2bd7fe91f229f8d57d3c3799262bb2 (diff) | |
| download | pkgsrc-2c8efb738f3f55a5326592a0dc7e7d5f6dc24c39.tar.gz | |
Fix shlib execute perm pattern (was broken after 1.1537).
Also, to address concerns raised on tech-pkg, only issue the warning about
execute permission if PKG_DEVELOPER is set.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d4cbe798056..7cd9ea3f459 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1528 2004/10/27 21:45:53 recht Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1529 2004/10/28 14:05:56 tv Exp $ # # This file is in the public domain. # @@ -4724,10 +4724,11 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} if ${TEST} "$$bins" != "" -o "$$libs" != ""; then \ requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} 'NF == 3 { print $$3 }' | ${SORT} -u`; \ fi; \ - linklibs=`${SETENV} PREFIX=${PREFIX} ${AWK} '/^[^@].*\.so$$/ { print ENVIRON["PREFIX"] "/" $$0 }' ${PLIST} || ${TRUE}`; \ + linklibs=`${SETENV} PREFIX=${PREFIX} ${AWK} '/^[^@].*\.so\.[0-9\.]+$$/ { print ENVIRON["PREFIX"] "/" $$0 }' ${PLIST} || ${TRUE}`; \ for i in $${linklibs}; do \ if ${TEST} -r $$i -a ! -x $$i -a ! -h $$i; then \ - ${ECHO} "$$i: installed without execute permission; fixing (should use [BSD_]INSTALL_LIB)"; \ + ${TEST} "${PKG_DEVELOPER:Uno}" = "no" || \ + ${ECHO} "$$i: installed without execute permission; fixing (should use [BSD_]INSTALL_LIB)"; \ ${CHMOD} +x $$i; \ fi; \ done; \ |