pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/check The interpreter check for packages which are ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b76dd7b6fe7
branches:  trunk
changeset: 535911:2b76dd7b6fe7
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Fri Nov 30 08:34:31 2007 +0000

description:
The interpreter check for packages which are their own interpreter,
e.g. lang/perl5, was failing.  Adding a check for ${DESTDIR}"$$interp"
fixes this.

diffstat:

 mk/check/check-interpreter.mk |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r b93bd05252c4 -r 2b76dd7b6fe7 mk/check/check-interpreter.mk
--- a/mk/check/check-interpreter.mk     Fri Nov 30 08:27:51 2007 +0000
+++ b/mk/check/check-interpreter.mk     Fri Nov 30 08:34:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check-interpreter.mk,v 1.20 2007/11/07 10:52:00 rillig Exp $
+# $NetBSD: check-interpreter.mk,v 1.21 2007/11/30 08:34:31 bjs Exp $
 #
 # This file checks that after installation, all files of the package
 # that start with a "#!" line will find their interpreter. Files that
@@ -63,10 +63,14 @@
                case "$$interp" in                                      \
                "") continue;                                           \
                esac;                                                   \
-               if [ ! -f "$$interp" ]; then                            \
+                                                                       \
+               if { [ ! -f ${DESTDIR:Q}"$$interp" ] &&                 \
+                    [ ! -f "$$interp" ]; }; then                       \
+                                                                       \
                        if [ -x "$$file" ]; then                        \
                                ${DELAYED_ERROR_MSG} "[check-interpreter.mk] The interpreter \"$$interp\" of \"${DESTDIR}${PREFIX}/$$file\" does not exist."; \
                        else                                            \
+                                                                       \
                                ${DELAYED_WARNING_MSG} "[check-interpreter.mk] The interpreter \"$$interp\" of \"${DESTDIR}${PREFIX}/$$file\" does not exist."; \
                        fi;                                             \
                fi;                                                     \



Home | Main Index | Thread Index | Old Index