From d4732893d73d2510d29559c392c7b144eb88d44c Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Wed, 29 Apr 2015 13:05:28 +0000
Subject: Only check executable files for valid interpreters.  By the time this
 check is performed all installed files should have their correct mode set,
 and there are no INSTALL scripts that currently change file modes under
 PREFIX after installation (nor should they ever).

This change considerably speeds up the test.  For example in www/firefox-l10n
the time to run the test reduces from 181 seconds (135 seconds of system time)
down to 10 seconds (6 seconds system time) on my SmartOS build systems.
---
 mk/check/check-interpreter.mk | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'mk')

diff --git a/mk/check/check-interpreter.mk b/mk/check/check-interpreter.mk
index cbb8a73bedc..7970df4945b 100644
--- a/mk/check/check-interpreter.mk
+++ b/mk/check/check-interpreter.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-interpreter.mk,v 1.28 2014/10/12 23:39:17 joerg Exp $
+# $NetBSD: check-interpreter.mk,v 1.29 2015/04/29 13:05:28 jperkin Exp $
 #
 # This file checks that after installation, all files of the package
 # that start with a "#!" line will find their interpreter. Files that
@@ -53,7 +53,7 @@ _check-interpreter: error-check .PHONY
 		${_CHECK_INTERP_SKIP:@p@${p}) continue ;;@}		\
 		*) ;;							\
 		esac;							\
-		if [ ! -f "$$file" ]; then				\
+		if [ ! -x "$$file" ]; then				\
 			continue;					\
 		fi;							\
 		if [ ! -r "$$file" ]; then				\
@@ -74,15 +74,8 @@ _check-interpreter: error-check .PHONY
 			fi;						\
 			continue;;					\
 		esac;							\
-									\
 		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;						\
+			${DELAYED_ERROR_MSG} "[check-interpreter.mk] The interpreter \"$$interp\" of \"${DESTDIR}${PREFIX}/$$file\" does not exist."; \
 		fi;							\
 	done
-- 
cgit v1.2.3