diff options
| author | tron <tron@pkgsrc.org> | 2006-09-10 16:39:31 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2006-09-10 16:39:31 +0000 |
| commit | 12b930fb12f747c322958d28dc34e3e2e4a897f5 (patch) | |
| tree | 90fd164ade980a6bc9a646840930f92d1c253b85 | |
| parent | b08b4f393b8f9d7763d044da2ce44f5977210e7d (diff) | |
| download | pkgsrc-12b930fb12f747c322958d28dc34e3e2e4a897f5.tar.gz | |
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.
| -rwxr-xr-x | mk/buildlink3/imake-check | 15 | ||||
| -rw-r--r-- | mk/buildlink3/imake-check.mk | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/mk/buildlink3/imake-check b/mk/buildlink3/imake-check index c5d5d5c593c..089fbc762ef 100755 --- a/mk/buildlink3/imake-check +++ b/mk/buildlink3/imake-check @@ -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 @@ builtin-test: #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 --git a/mk/buildlink3/imake-check.mk b/mk/buildlink3/imake-check.mk index 333e0ce9301..2acecb92457 100644 --- a/mk/buildlink3/imake-check.mk +++ b/mk/buildlink3/imake-check.mk @@ -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 @@ IMAKE?= ${X11BASE}/bin/imake # XXX 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/^[^:]*\://}; \ |