[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Fix PR pkg/34139 in a diffent way:

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/57bc6183096d
branches:  trunk
changeset: 518467:57bc6183096d
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Sep 10 16:39:31 2006 +0000

description:
Fix PR pkg/34139 in a diffent way:
Setting "WRAPPER_SKIP_TRANSFORM" to "yes" isn't enough because "imake"
will invoke the C compiler which might be a wrapper script which always
fails because the package didn't use "USE_LANGUAGES+= c".

The "imake-check" script now simply uses the original command path before
"bsd.pkg.mk" modified and will therefore avoid using any wrappers.

diffstat:

 mk/buildlink3/imake-check    |  15 ++++++++++-----
 mk/buildlink3/imake-check.mk |   5 +++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r ef9ac1cf1f1d -r 57bc6183096d mk/buildlink3/imake-check
--- a/mk/buildlink3/imake-check Sun Sep 10 13:52:26 2006 +0000
+++ b/mk/buildlink3/imake-check Sun Sep 10 16:39:31 2006 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: imake-check,v 1.4 2006/09/03 13:07:59 hira Exp $
+# $NetBSD: imake-check,v 1.5 2006/09/10 16:39:31 tron Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -79,11 +79,16 @@
 #endif
 EOF
 
+# Reset command path to avoid calling wrapper scripts.
+if [ -n "$_PATH_ORIG" ]
+then
+       PATH="$_PATH_ORIG"; export PATH
+fi
+
 # Run imake to process the Imakefile.
-WRAPPER_SKIP_TRANSFORM=yes \
-       ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config -s - |
-       ${IMAKE_MAKE} -f - builtin-test |
-       ${GREP} -q yes
+${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config -s - |
+${IMAKE_MAKE} -f - builtin-test |
+${GREP} -q yes
 exitcode="$?"
 
 # Clean up after ourselves.
diff -r ef9ac1cf1f1d -r 57bc6183096d mk/buildlink3/imake-check.mk
--- a/mk/buildlink3/imake-check.mk      Sun Sep 10 13:52:26 2006 +0000
+++ b/mk/buildlink3/imake-check.mk      Sun Sep 10 16:39:31 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: imake-check.mk,v 1.4 2005/08/10 16:28:59 jlam Exp $
+# $NetBSD: imake-check.mk,v 1.5 2006/09/10 16:39:31 tron Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -67,7 +67,8 @@
 BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}!=                           \
        if ${SETENV} CAT=${CAT:Q} ECHO=${ECHO:Q} GREP=${GREP:Q}         \
                IMAKE=${IMAKE:Q} IMAKE_MAKE=${IMAKE_MAKE:Q}             \
-               MKDIR=${MKDIR:Q} RM=${RM:Q} TEST=${TEST:Q}              \
+               MKDIR=${MKDIR:Q} PATH_ORIG=${_PATH_ORIG:Q}              \
+               RM=${RM:Q} TEST=${TEST:Q}                               \
                X11BASE=${X11BASE:Q}                                    \
           ${SH} ${.CURDIR}/../../mk/buildlink3/imake-check             \
                ${_pair_:C/^[^:]*\://};                                 \