diff options
| author | tv <tv@pkgsrc.org> | 2004-10-27 13:47:41 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-10-27 13:47:41 +0000 |
| commit | 768b2b2df799dcda03dbc9d71b6494ae401f8048 (patch) | |
| tree | 09af3a4d842100f5ac6859d95d3cb5c2f4f87ce2 /mk | |
| parent | e98da31ec15c022f31b0c516aee71fccfeaa3e92 (diff) | |
| download | pkgsrc-768b2b2df799dcda03dbc9d71b6494ae401f8048.tar.gz | |
Don't chmod shlibs that are symlinks; fixes issue noted by <grant@netbsd.org>.
Also don't do the ldd-REQUIRES dance unless SHLIB_HANDLING=YES (because you
don't want to run a native ldd on a foreign binary).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 55194ae05b7..dd2b9a1c392 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1526 2004/10/27 10:41:43 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1527 2004/10/27 13:47:41 tv Exp $ # # This file is in the public domain. # @@ -4709,7 +4709,7 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} . ifdef _USE_GMAKE @${ECHO} "GMAKE=`${GMAKE} --version | ${GREP} Make`" >> ${BUILD_INFO_FILE} . endif -. if ${CHECK_SHLIBS} == "YES" +. if ${SHLIB_HANDLING} == "YES" && ${CHECK_SHLIBS} == "YES" ${_PKG_SILENT}${_PKG_DEBUG} \ case "${LDD}" in \ "") ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'`;; \ @@ -4723,7 +4723,7 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} fi; \ linklibs=`${SETENV} PREFIX=${PREFIX} ${AWK} '/^[^@].*\.so$$/ { print ENVIRON["PREFIX"] "/" $$0 }' ${PLIST} || ${TRUE}`; \ for i in $${linklibs}; do \ - if ${TEST} -r $$i -a ! -x $$i; then \ + if ${TEST} -r $$i -a ! -x $$i -a ! -h $$i; then \ ${ECHO} "$$i: installed without execute permission; fixing (should use [BSD_]INSTALL_LIB)"; \ ${CHMOD} +x $$i; \ fi; \ |