pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Don't chmod shlibs that are symlinks; fixes issue n...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d5f63f3564d
branches:  trunk
changeset: 482393:8d5f63f3564d
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Oct 27 13:47:41 2004 +0000

description:
Don't chmod shlibs that are symlinks; fixes issue noted by <grant%netbsd.org@localhost>.
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:

 mk/bsd.pkg.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 7c0316df2033 -r 8d5f63f3564d mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Oct 27 10:41:43 2004 +0000
+++ b/mk/bsd.pkg.mk     Wed Oct 27 13:47:41 2004 +0000
@@ -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 @@
 .  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 @@
                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;                                             \



Home | Main Index | Thread Index | Old Index